diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 0c40a1b..44e01b3 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -57,13 +57,15 @@ jobs: - name: Generate .env.tpl shell: bash run: | - echo "FILE_SECRET=op://${{ secrets.VAULT }}/test-secret/password" > tests/.env.tpl - echo "FILE_SECRET_IN_SECTION=op://${{ secrets.VAULT }}/test-secret/test-section/password" >> tests/.env.tpl - echo "FILE_MULTILINE_SECRET=op://${{ secrets.VAULT }}/multiline-secret/notesPlain" >> tests/.env.tpl - echo "FILE_WEBSITE=op://${{ secrets.VAULT }}/test-secret/website" >> tests/.env.tpl - echo "FILE_TEST_SSH_KEY=op://${{ secrets.VAULT }}/test-ssh-key/private key" >> tests/.env.tpl - echo "FILE_TEST_SSH_KEY_OPENSSH=op://${{ secrets.VAULT }}/test-ssh-key/private key?ssh-format=openssh" >> tests/.env.tpl + echo "FILE_SECRET=op://${VAULT}/test-secret/password" > tests/.env.tpl + echo "FILE_SECRET_IN_SECTION=op://${VAULT}/test-secret/test-section/password" >> tests/.env.tpl + echo "FILE_MULTILINE_SECRET=op://${VAULT}/multiline-secret/notesPlain" >> tests/.env.tpl + echo "FILE_WEBSITE=op://${VAULT}/test-secret/website" >> tests/.env.tpl + echo "FILE_TEST_SSH_KEY=op://${VAULT}/test-ssh-key/private key" >> tests/.env.tpl + echo "FILE_TEST_SSH_KEY_OPENSSH=op://${VAULT}/test-ssh-key/private key?ssh-format=openssh" >> tests/.env.tpl + env: + VAULT: ${{ secrets.VAULT }} - name: Configure Service account uses: ./configure with: @@ -166,12 +168,14 @@ jobs: - name: Generate .env.tpl run: | mkdir -p tests - echo "FILE_SECRET=op://${{ secrets.VAULT }}/test-secret/password" > tests/.env.tpl - echo "FILE_SECRET_IN_SECTION=op://${{ secrets.VAULT }}/test-secret/test-section/password" >> tests/.env.tpl - echo "FILE_MULTILINE_SECRET=op://${{ secrets.VAULT }}/multiline-secret/notesPlain" >> tests/.env.tpl - echo "FILE_TEST_SSH_KEY=op://${{ secrets.VAULT }}/test-ssh-key/private key" >> tests/.env.tpl - echo "FILE_TEST_SSH_KEY_OPENSSH=op://${{ secrets.VAULT }}/test-ssh-key/private key?ssh-format=openssh" >> tests/.env.tpl + echo "FILE_SECRET=op://${VAULT}/test-secret/password" > tests/.env.tpl + echo "FILE_SECRET_IN_SECTION=op://${VAULT}/test-secret/test-section/password" >> tests/.env.tpl + echo "FILE_MULTILINE_SECRET=op://${VAULT}/multiline-secret/notesPlain" >> tests/.env.tpl + echo "FILE_TEST_SSH_KEY=op://${VAULT}/test-ssh-key/private key" >> tests/.env.tpl + echo "FILE_TEST_SSH_KEY_OPENSSH=op://${VAULT}/test-ssh-key/private key?ssh-format=openssh" >> tests/.env.tpl + env: + VAULT: ${{ secrets.VAULT }} - name: Launch 1Password Connect instance env: OP_CONNECT_CREDENTIALS: ${{ secrets.OP_CONNECT_CREDENTIALS }} diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index 7b57196..f4c9d6b 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v6 - name: Run ShellCheck - uses: ludeeus/action-shellcheck@2.0.0 + uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # 2.0.0 with: ignore_paths: >- .husky diff --git a/.github/workflows/ok-to-test.yml b/.github/workflows/ok-to-test.yml index cb1c547..a51e323 100644 --- a/.github/workflows/ok-to-test.yml +++ b/.github/workflows/ok-to-test.yml @@ -15,7 +15,7 @@ jobs: if: ${{ github.event.issue.pull_request }} steps: - name: Slash Command Dispatch - uses: peter-evans/slash-command-dispatch@v5 + uses: peter-evans/slash-command-dispatch@9bdcd7914ec1b75590b790b844aa3b8eee7c683a # v5 with: token: ${{ secrets.GITHUB_TOKEN }} reaction-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pr-check-signed-commits.yml b/.github/workflows/pr-check-signed-commits.yml index 77a8b8a..466b030 100644 --- a/.github/workflows/pr-check-signed-commits.yml +++ b/.github/workflows/pr-check-signed-commits.yml @@ -10,4 +10,4 @@ jobs: runs-on: ubuntu-latest steps: - name: Check signed commits in PR - uses: 1Password/check-signed-commits-action@v1 + uses: 1Password/check-signed-commits-action@ed2885f3ed2577a4f5d3c3fe895432a557d23d52 # v1 diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index ff26a87..f02a3fc 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -65,7 +65,7 @@ jobs: echo "condition=skip" >> $GITHUB_OUTPUT echo "Setting condition=skip (sha does not match or empty)" fi - elif [ "${{ github.event_name }}" == "push" ] && [ "${{ github.ref_name }}" == "main" ]; then + elif [ "${{ github.event_name }}" == "push" ] && [ "${REF_NAME}" == "main" ]; then echo "condition=push-to-main" >> $GITHUB_OUTPUT echo "Setting condition=push-to-main (push to main)" echo "ref=${{ github.sha }}" >> $GITHUB_OUTPUT @@ -75,6 +75,8 @@ jobs: echo "Setting condition=skip (unknown event type: ${{ github.event_name }})" fi + env: + REF_NAME: ${{ github.ref_name }} e2e: needs: check-external-pr if: | @@ -105,7 +107,7 @@ jobs: run: echo "run-url=https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> $GITHUB_OUTPUT - name: Create comment on PR - uses: peter-evans/create-or-update-comment@v5 + uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5 with: issue-number: ${{ github.event.client_payload.pull_request.number }} body: |