From 122fefcbc57bfe4c8541340dd8b8becbbb85304e Mon Sep 17 00:00:00 2001 From: Leandro Emmanuel Reina Kiperman Date: Thu, 2 Jun 2022 02:25:54 +0200 Subject: [PATCH] Fix sub-actions' secrets --- .github/actions/nix/action.yml | 7 ++++++- .github/actions/release/action.yml | 6 +++--- .github/workflows/check.yml | 14 ++++++++++++++ .github/workflows/release.yml | 2 ++ .github/workflows/update.yml | 2 ++ 5 files changed, 27 insertions(+), 4 deletions(-) diff --git a/.github/actions/nix/action.yml b/.github/actions/nix/action.yml index 15f9c70..89af420 100644 --- a/.github/actions/nix/action.yml +++ b/.github/actions/nix/action.yml @@ -1,6 +1,11 @@ name: "Set up Nix + Cache" description: "" +inputs: + CACHE_TOKEN: + description: "" + required: true + runs: using: "composite" steps: @@ -13,7 +18,7 @@ runs: uses: cachix/cachix-action@v10 with: name: kip93 - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + authToken: "${{ inputs.CACHE_TOKEN }}" extraPullNames: nix-community skipPush: true diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml index a7f620f..dc9a69c 100644 --- a/.github/actions/release/action.yml +++ b/.github/actions/release/action.yml @@ -50,11 +50,11 @@ runs: - name: Publish release uses: softprops/action-gh-release@v1 with: - name: ${{ steps.tag.outputs.tag }} - tag_name: ${{ steps.tag.outputs.tag }} + name: "${{ steps.tag.outputs.tag }}" + tag_name: "${{ steps.tag.outputs.tag }}" body_path: .build/CHANGELOG.md - prerelease: ${{ github.ref != 'refs/heads/main' }} + prerelease: "${{ github.ref != 'refs/heads/main' }}" files: | ./.build/firmware.hex diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index d4d4b25..d6d84a3 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -24,6 +24,8 @@ jobs: - name: "Nix: set up" uses: ./.github/actions/nix + with: + CACHE_TOKEN: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: "Nix: format" run: | @@ -41,6 +43,8 @@ jobs: - name: "Nix: set up" uses: ./.github/actions/nix + with: + CACHE_TOKEN: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: "Nix: lint" run: | @@ -58,6 +62,8 @@ jobs: - name: "Nix: set up" uses: ./.github/actions/nix + with: + CACHE_TOKEN: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: "Nix: shellcheck" run: | @@ -75,6 +81,8 @@ jobs: - name: "Nix: set up" uses: ./.github/actions/nix + with: + CACHE_TOKEN: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: "Nix: vulnerabilities" run: | @@ -93,6 +101,8 @@ jobs: - name: "Nix: set up" uses: ./repo/.github/actions/nix + with: + CACHE_TOKEN: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: "Nix: logic" working-directory: ./repo @@ -112,6 +122,8 @@ jobs: - name: "Nix: set up" uses: ./.github/actions/nix + with: + CACHE_TOKEN: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: "QMK: format" run: | @@ -129,6 +141,8 @@ jobs: - name: "Nix: set up" uses: ./.github/actions/nix + with: + CACHE_TOKEN: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: "QMK: lint" run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9db5678..e951fa7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,6 +28,8 @@ jobs: - name: Set up Nix uses: ./.github/actions/nix + with: + CACHE_TOKEN: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: Compile run: | diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 33447e9..c945504 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -20,6 +20,8 @@ jobs: - name: Set up uses: ./.github/actions/nix + with: + CACHE_TOKEN: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: Update QMK run: |