From da269fff0d1c420b73057fa0ba0194a4a9169a29 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Sat, 6 Jul 2024 21:26:54 -0400 Subject: [PATCH] fix(actions): reenable hosted cache Signed-off-by: Cameron Smith --- .github/actions/build_nix_image/action.yml | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/actions/build_nix_image/action.yml b/.github/actions/build_nix_image/action.yml index 0f6c74730..3ebaf727d 100644 --- a/.github/actions/build_nix_image/action.yml +++ b/.github/actions/build_nix_image/action.yml @@ -71,26 +71,26 @@ runs: # - name: Setup Local Nix Cache # uses: DeterminateSystems/magic-nix-cache-action@b46e247b898aa56e6d2d2e728dc6df6c84fdb738 # ratchet:DeterminateSystems/magic-nix-cache-action@v7 - # - name: Setup Remote Nix Cache - # uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # ratchet:cachix/cachix-action@v15 - # with: - # name: "${{ inputs.cachixCacheName }}" - # authToken: "${{ inputs.cachixAuthToken }}" - - - name: "Authenticate to Google Cloud" - uses: "google-github-actions/auth@55bd3a7c6e2ae7cf1877fd1ccb9d54c0503c457c" # ratchet:google-github-actions/auth@v2 + - name: Setup Remote Nix Cache + uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # ratchet:cachix/cachix-action@v15 with: - credentials_json: "${{ inputs.gacd }}" + name: "${{ inputs.cachixCacheName }}" + authToken: "${{ inputs.cachixAuthToken }}" - - name: Set up cache - uses: zombiezen/setup-nix-cache-action@cacc7abf0a6636b0ef45ec2ae055a9734cdd4122 # ratchet:zombiezen/setup-nix-cache-action@main - with: - substituters: "${{ inputs.nixSubstituterName }}" - secret_keys: "${{ inputs.nixPrivateKey }}" - use_nixcached: true - nixcached_upload_options: --jobs 8 --debug - # aws_access_key_id: "${{ inputs.gcsHmacAccessID }}" - # aws_secret_access_key: "${{ inputs.gcsHmacSecretAccessKey }}" + # - name: "Authenticate to Google Cloud" + # uses: "google-github-actions/auth@55bd3a7c6e2ae7cf1877fd1ccb9d54c0503c457c" # ratchet:google-github-actions/auth@v2 + # with: + # credentials_json: "${{ inputs.gacd }}" + + # - name: Set up cache + # uses: zombiezen/setup-nix-cache-action@cacc7abf0a6636b0ef45ec2ae055a9734cdd4122 # ratchet:zombiezen/setup-nix-cache-action@main + # with: + # substituters: "${{ inputs.nixSubstituterName }}" + # secret_keys: "${{ inputs.nixPrivateKey }}" + # use_nixcached: true + # nixcached_upload_options: --jobs 8 --debug + # # aws_access_key_id: "${{ inputs.gcsHmacAccessID }}" + # # aws_secret_access_key: "${{ inputs.gcsHmacSecretAccessKey }}" - name: Set GitHub CI Slug Variables uses: rlespinasse/github-slug-action@797d68864753cbceedc271349d402da4590e6302 # ratchet:rlespinasse/github-slug-action@v4