diff --git a/.github/workflows/test-download-artifacts.yml b/.github/workflows/test-download-artifacts.yml index c3b01fd9..39f33fa0 100644 --- a/.github/workflows/test-download-artifacts.yml +++ b/.github/workflows/test-download-artifacts.yml @@ -31,10 +31,10 @@ jobs: echo $GITHUB_SHA - download-master: - name: Download master + download-main: + name: Download main runs-on: ubuntu-22.04 - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' steps: - name: Checkout uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 @@ -45,7 +45,7 @@ jobs: workflow: upload-test-artifacts.yml artifacts: artifact path: artifact - branch: master + branch: main - name: Test run: | @@ -81,7 +81,7 @@ jobs: download-pr: name: Download Pull Request runs-on: ubuntu-22.04 - if: github.ref != 'refs/heads/master' + if: github.ref != 'refs/heads/main' steps: - name: Checkout uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 diff --git a/.github/workflows/test-release-version-check.yml b/.github/workflows/test-release-version-check.yml index 715f724d..d2edcfd7 100644 --- a/.github/workflows/test-release-version-check.yml +++ b/.github/workflows/test-release-version-check.yml @@ -7,7 +7,7 @@ on: - "release-check-version" push: branches: - - "master" + - "main" workflow_dispatch: inputs: {} diff --git a/.github/workflows/workflow-linter.yml b/.github/workflows/workflow-linter.yml index 20b67bc9..146751d3 100644 --- a/.github/workflows/workflow-linter.yml +++ b/.github/workflows/workflow-linter.yml @@ -32,7 +32,7 @@ jobs: - name: Workflow Lint env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: bitwarden/gh-actions/lint-workflow@master + uses: bitwarden/gh-actions/lint-workflow@main with: workflows: ${{ steps.changed-workflows.outputs.modified-workflows }} @@ -49,5 +49,5 @@ jobs: FILE: ${{ steps.changed-files.outputs.all_changed_files }} run: | FILES=$(echo "${{ env.FILE }}") - curl -o $PWD/version-lint.sh https://raw.githubusercontent.com/bitwarden/gh-actions/master/.github/version-lint.sh + curl -o $PWD/version-lint.sh https://raw.githubusercontent.com/bitwarden/gh-actions/main/.github/version-lint.sh chmod +x $PWD/version-lint.sh && $PWD/version-lint.sh $FILES diff --git a/get-keyvault-secrets/README.md b/get-keyvault-secrets/README.md index d84d3030..78e403e4 100644 --- a/get-keyvault-secrets/README.md +++ b/get-keyvault-secrets/README.md @@ -2,7 +2,7 @@ With the Get Key Vault Secrets action, you can fetch secrets from an [Azure Key Vault](https://docs.microsoft.com/en-us/rest/api/keyvault/about-keys--secrets-and-certificates) instance and consume in your GitHub Action workflows. -The definition of this GitHub Action is in [action.yml](https://github.com/bitwarden/gh-actions/blob/master/get-keyvault-secrets/action.yml). +The definition of this GitHub Action is in [action.yml](https://github.com/bitwarden/gh-actions/blob/main/get-keyvault-secrets/action.yml). Secrets fetched will be set as [outputs](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/metadata-syntax-for-github-actions#outputs) of the keyvault action instance and can be consumed in the subsequent actions in the workflow using the notation: `${{ steps..outputs. }}`. In addition, secrets are also set as environment variables. All the variables are automatically masked if printed to the console or to logs. diff --git a/setup-docker-trust/action.yml b/setup-docker-trust/action.yml index 4b24b593..9b6290cd 100644 --- a/setup-docker-trust/action.yml +++ b/setup-docker-trust/action.yml @@ -28,7 +28,7 @@ runs: - name: Retrieve secrets id: get-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@master + uses: bitwarden/gh-actions/get-keyvault-secrets@main with: keyvault: "${{ inputs.azure-keyvault-name }}" secrets: "docker-password,