Compare commits

..

No commits in common. "main" and "v1" have entirely different histories.
main ... v1

2 changed files with 3 additions and 4 deletions

View File

@ -4,7 +4,6 @@ on:
push: push:
branches: branches:
- main - main
jobs: jobs:
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -12,7 +11,7 @@ jobs:
image: ovlach/docker-gitea:v0.0.2-alpha image: ovlach/docker-gitea:v0.0.2-alpha
steps: steps:
- uses: https://github.com/actions/checkout.git@v4 - uses: https://github.com/actions/checkout.git@v4
- uses: actions/docker-image@v1 - uses: actions/docker-image@main
name: Test action name: Test action
id: docker_image_test id: docker_image_test
with: with:

View File

@ -57,7 +57,7 @@ runs:
shell: sh shell: sh
- name: Build additional args (version etc.) - name: Build additional args (version etc.)
id: additional_args id: additional_args
run: echo "::set-output name=additional_args::$(if [[ "${{inputs.additional_version}}" != "" ]]; then echo "-t ${{ inputs.image_name }}:${{inputs.docker_version_prefix}}-${{inputs.additional_version}}"; else echo ""; fi)" run: echo "::set-output name=additional_args::$(if [[ "${{inputs.additional_version}}" != "" ]]; then echo "-t ${{ inputs.image_name }}:${{inputs.additional_version}}-${{inputs.docker_version_prefix}}"; else echo ""; fi)"
shell: sh shell: sh
- name: Build and push docker - name: Build and push docker
run: | run: |
@ -67,7 +67,7 @@ runs:
docker push ${{ inputs.image_name }}:${{inputs.docker_version_prefix}}-${{ steps.git.outputs.short_hash }} docker push ${{ inputs.image_name }}:${{inputs.docker_version_prefix}}-${{ steps.git.outputs.short_hash }}
if [[ "${{inputs.additional_version}}" != "" ]]; then if [[ "${{inputs.additional_version}}" != "" ]]; then
docker push ${{ inputs.image_name }}:${{inputs.docker_version_prefix}}-${{inputs.additional_version}} docker push ${{ inputs.image_name }}:${{inputs.additional_version}}-${{inputs.docker_version_prefix}}
fi fi
fi fi
shell: sh shell: sh