From 4424cca615025a81e16c4a2d6cec486092bf7819 Mon Sep 17 00:00:00 2001 From: Christoph Hamsen Date: Mon, 5 Feb 2024 11:58:34 +0100 Subject: [PATCH 1/2] ci: fix branch references --- .github/actions/context/action.yaml | 4 ++-- .github/workflows/.reusable-cleanup-registry.yml | 2 +- .github/workflows/.reusable-compliance.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/context/action.yaml b/.github/actions/context/action.yaml index ea81d45..bbba9cb 100644 --- a/.github/actions/context/action.yaml +++ b/.github/actions/context/action.yaml @@ -73,9 +73,9 @@ runs: ORIGINAL_TAG=v${{ steps.get_app_version.outputs.result }} BUILD_REGISTRY=${{ inputs.build_registry }} BUILD_REPO=${{ inputs.build_repo }} - if [[ "${GHREF}" != "refs/heads/master" && + if [[ "${GHREF}" != "refs/heads/main" && "${GHREF}" != "refs/tags/v"* && - "${GHREF}" != "refs/heads/develop" + "${GHREF}" != "refs/heads/dev" ]]; then BUILD_REPO="${BUILD_REPO}-test" fi diff --git a/.github/workflows/.reusable-cleanup-registry.yml b/.github/workflows/.reusable-cleanup-registry.yml index 66d0d79..e4a973d 100644 --- a/.github/workflows/.reusable-cleanup-registry.yml +++ b/.github/workflows/.reusable-cleanup-registry.yml @@ -32,7 +32,7 @@ jobs: uses: snok/container-retention-policy@3d27e6a0361deed0b7dc5099a82eadd07924b177 # v2.1.3 with: image-names: semgr8s - skip-tags: master, develop, v*, sha256-* + skip-tags: "main", "dev", "v*.*.*", "sha256-*" cut-off: four days ago UTC+1 timestamp-to-use: updated_at account-type: org diff --git a/.github/workflows/.reusable-compliance.yml b/.github/workflows/.reusable-compliance.yml index af38ccf..1a586ad 100644 --- a/.github/workflows/.reusable-compliance.yml +++ b/.github/workflows/.reusable-compliance.yml @@ -14,7 +14,7 @@ jobs: ossf-scorecard: runs-on: ubuntu-latest if: | - (github.ref_name == 'master' || github.event_name == 'pull_request') && + (github.ref_name == 'main' || github.event_name == 'pull_request') && inputs.skip != 'non-required' && inputs.skip != 'all' # permissions: #TODO: reactivate for non-private @@ -31,7 +31,7 @@ jobs: results_file: results.sarif results_format: sarif repo_token: ${{ secrets.SCORECARD_TOKEN }} - publish_results: ${{ github.ref_name == 'master' }} + publish_results: ${{ github.ref_name == 'main' }} - name: Upload uses: github/codeql-action/upload-sarif@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7 with: From 840dfd42f74303683598b7a2c96300cad1c9e156 Mon Sep 17 00:00:00 2001 From: Christoph Hamsen Date: Mon, 5 Feb 2024 11:58:53 +0100 Subject: [PATCH 2/2] ci: fix email references --- .github/workflows/.reusable-docs.yml | 2 +- mkdocs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/.reusable-docs.yml b/.github/workflows/.reusable-docs.yml index 2919eed..be784bf 100644 --- a/.github/workflows/.reusable-docs.yml +++ b/.github/workflows/.reusable-docs.yml @@ -28,7 +28,7 @@ jobs: - name: Configure the git user run: | git config user.name "versioning_user" - git config user.email "connaisseur@securesystems.dev" + git config user.email "semgr8s@securesystems.de" - name: Install run: | pip install -r docs/requirements.txt diff --git a/mkdocs.yml b/mkdocs.yml index 892f65a..42e6f2e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -80,7 +80,7 @@ extra: link: https://www.securesystems.de/ name: SSE Website - icon: fontawesome/solid/envelope - link: mailto:christoph.hamsen@securesystems.dev + link: mailto:semgr8s@securesystems.de name: Email contact # Page tree