chore: update nixsgx flake and minor fixes

* Refine Docker image tagging process in GitHub workflow build_and_publish_tee.yaml to optimally include variable IMAGE_TAG. * Update nixos-sgx dependency in flake.lock with latest revisions and hashes. * Add '.direnv' directory to .gitignore to prevent environmental configs from being tracked. Signed-off-by: Harald Hoyer <[email protected]>
matter-labs · Jun 26, 2024 · 723f759 · 723f759
1 parent 4080246
commit 723f759
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/build_and_publish_tee.yaml b/.github/workflows/build_and_publish_tee.yaml
@@ -83,7 +83,7 @@ jobs:
       - name: Push Docker image to matterlabs-infra
         if: ${{ !startsWith(github.ref, 'refs/tags') }}
         run: |
-          docker tag "${{ steps.build.outputs.IMAGE_TAG}}" "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/fee-withdrawer-v2-tee:latest"
+          docker tag "${{ steps.build.outputs.IMAGE_TAG }}" "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/fee-withdrawer-v2-tee:latest"
           docker push "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/fee-withdrawer-v2-tee:latest"
-          docker tag "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/fee-withdrawer-v2-tee:latest" "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/fee-withdrawer-v2-tee:${{ steps.flux.outputs.BUILD_ID }}"
+          docker tag "${{ steps.build.outputs.IMAGE_TAG }}" "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/fee-withdrawer-v2-tee:${{ steps.flux.outputs.BUILD_ID }}"
           docker push "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/fee-withdrawer-v2-tee:${{ steps.flux.outputs.BUILD_ID }}"
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 .idea
+.direnv
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,11 @@
 {
   description = "era-fee-withdrawer";
 
+  nixConfig = {
+    extra-substituters = ["https://nixsgx.cachix.org"];
+    extra-trusted-public-keys = ["nixsgx.cachix.org-1:tGi36DlY2joNsIXOlGnSgWW0+E094V6hW0umQRo/KoE="];
+  };
+
   inputs = {
     nixsgx-flake.url = "github:matter-labs/nixsgx";
     nixpkgs.follows = "nixsgx-flake/nixpkgs";