Skip to content

Commit

Permalink
All workflows - Update 'master' to 'main' for any actions in the gh-a…
Browse files Browse the repository at this point in the history
…ctions repository (#207)
  • Loading branch information
vgrassia authored Nov 9, 2023
1 parent d336bf2 commit a497efc
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test-download-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -45,7 +45,7 @@ jobs:
workflow: upload-test-artifacts.yml
artifacts: artifact
path: artifact
branch: master
branch: main

- name: Test
run: |
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-release-version-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- "release-check-version"
push:
branches:
- "master"
- "main"
workflow_dispatch:
inputs: {}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/workflow-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand All @@ -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
2 changes: 1 addition & 1 deletion get-keyvault-secrets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.<Id-of-the-KeyVault-Action>.outputs.<Secret-Key> }}`. In addition, secrets are also set as environment variables. All the variables are automatically masked if printed to the console or to logs.

Expand Down
2 changes: 1 addition & 1 deletion setup-docker-trust/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit a497efc

Please sign in to comment.