Skip to content

Commit

Permalink
ci: fix branch references
Browse files Browse the repository at this point in the history
  • Loading branch information
xopham committed Feb 5, 2024
1 parent 58ea8d2 commit 61bc395
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/actions/context/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/.reusable-cleanup-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/.reusable-compliance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down

0 comments on commit 61bc395

Please sign in to comment.