From 4d53e51bd13faba0460af269288f3ac91ee0fe18 Mon Sep 17 00:00:00 2001 From: katarinagud Date: Mon, 28 Oct 2024 13:32:58 +0100 Subject: [PATCH 1/2] use correct image path --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 8081b8b..81a8124 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -64,7 +64,7 @@ jobs: id: references run: | echo ${{ github.event_name }} - IMAGES=$(tr "," "\n" <<<"${{ inputs.images }}" | sed "s/^[[:space:]]*//;s/[[:space:]]*$//") + IMAGES=$(tr "," "\n" <<<"${{ env.DOCKER_IMAGE_REGISTRY_PATH }}" | sed "s/^[[:space:]]*//;s/[[:space:]]*$//") echo -e "Images to tag:\n$IMAGES" REFS=$(sed "s/$/:v${{ steps.tag.outputs.new_version }}/" <<<"$IMAGES" | paste -sd "," -) echo -e "References: $REFS" From 3fcd9406b85234dcc8b55a439c6adb4d83979b60 Mon Sep 17 00:00:00 2001 From: katarinagud Date: Mon, 28 Oct 2024 13:36:43 +0100 Subject: [PATCH 2/2] remove some of the inputs --- .github/workflows/dotnet.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 81a8124..4db7f47 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -17,7 +17,7 @@ jobs: name: 'build' runs-on: ubuntu-latest env: - RELEASE: ${{ github.event_name == 'push' && contains(inputs.branches || 'main,master', github.ref_name) }} + RELEASE: ${{ github.event_name == 'push' && contains('main,master', github.ref_name) }} steps: - uses: actions/checkout@v4 @@ -50,7 +50,7 @@ jobs: push: false no-cache: true context: . - file: ${{ inputs.dockerfile || 'Source/Dockerfile' }} + file: 'Source/Dockerfile' secrets: | NUGET_GITHUB_PACKAGES_USERNAME=${{ secrets.NUGET_GITHUB_PACKAGES_USERNAME }} NUGET_GITHUB_PACKAGES_TOKEN=${{ secrets.NUGET_GITHUB_PACKAGES_TOKEN }} @@ -83,7 +83,7 @@ jobs: with: push: true context: . - file: ${{ inputs.dockerfile || 'Source/Dockerfile' }} + file: 'Source/Dockerfile' platforms: linux/amd64 tags: ${{ steps.references.outputs.tags }} build-args: | @@ -100,4 +100,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh release create ${{ steps.tag.outputs.new_tag }} --target=${{ github.sha }} --title="${{ inputs.component && format('{0} - ',inputs.component) || '' }}v${{ steps.tag.outputs.new_version }}" --notes="${{ steps.tag.outputs.changelog }}" + gh release create ${{ steps.tag.outputs.new_tag }} --target=${{ github.sha }} --title="v${{ steps.tag.outputs.new_version }}" --notes="${{ steps.tag.outputs.changelog }}"