From dad5e99f0fb5956452fa43a6f1f6f572fd3c189f Mon Sep 17 00:00:00 2001 From: Timothy Schenk Date: Fri, 3 Nov 2023 15:13:18 +0100 Subject: [PATCH] ci: adjustments --- .gitea/workflows/server.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml index 4084989..329400a 100644 --- a/.gitea/workflows/server.yaml +++ b/.gitea/workflows/server.yaml @@ -20,7 +20,7 @@ jobs: sonarqube: needs: build-server runs-on: ubuntu-latest - if: ${{ github.ref_name }} == 'master' + if: github.ref_name == 'master' steps: - uses: actions/checkout@v3 - name: Setup dotnet @@ -105,7 +105,7 @@ jobs: context: . file: Server/Dockerfile push: true - tags: forge.rainote.dev/${{ github.repository }}:latest,forge.rainote.dev/${{ github.repository }}:${{ github.ref_name }} + tags: forge.rainote.dev/${{ github.repository }}:${{ github.ref_name }} platforms: linux/amd64 dependency-track-container: needs: build-push-server-container @@ -127,7 +127,7 @@ jobs: curl -sSfL https://raw.githubusercontent.com/docker/sbom-cli-plugin/main/install.sh | sh -s -- - name: Generate SBOM run: | - docker sbom --format cyclonedx-json --output bom.json forge.rainote.dev/Wonderking/Continuity:latest + docker sbom forge.rainote.dev/${{ github.repository }}:${{ github.ref_name }} --format cyclonedx-json --output bom.json - name: Upload SBOM uses: https://github.com/DependencyTrack/gh-upload-sbom@v2.0.1 with: