Update Go to v1.20

Signed-off-by: Chris Doherty <[email protected]>
tinkerbell · May 1, 2023 · d0512ca · d0512ca
1 parent 5df464f
commit d0512ca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -7,8 +7,8 @@ on:
       - "v*"
   pull_request:
 env:
-  CGO_ENABLED: 0
-  GO_VERSION: 1.18
+  CGO_ENABLED: "0"
+  GO_VERSION: "1.20"
 jobs:
   verify:
     name: Verify
@@ -27,12 +27,12 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: "${{ env.GO_VERSION }}"
-      - name: Install nix
-        uses: cachix/install-nix-action@v20
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - name: Install required nix packages
-        run: nix-shell --run 'true'
+      # - name: Install nix
+      #   uses: cachix/install-nix-action@v20
+      #   with:
+      #     nix_path: nixpkgs=channel:nixos-unstable
+      # - name: Install required nix packages
+      #   run: nix-shell --run 'true'
       - run: make test
       - name: Upload codecov
         run: bash <(curl -s https://codecov.io/bash)

diff --git a/shell.nix b/shell.nix
@@ -14,20 +14,20 @@ let
     # go 1.18.5
     owner = "NixOS";
     repo = "nixpkgs";
-    #branch@date: nixpkgs-unstable@2022-09-02
-    rev = "ee01de29d2f58d56b1be4ae24c24bd91c5380cea";
-    sha256 = "0829fqp43cp2ck56jympn5kk8ssjsyy993nsp0fjrnhi265hqps7";
+    # branch@date: nixpkgs-unstable@2023-03-30
+    rev = "8b3bc690e201c8d3cbd14633dbf3462a820e73f2";
+    sha256 = "sha256-+ckiCxbGFSs1/wHKCXAZnvb37Htf6k5nmQE3T0Y7hK8=";
   }) { };
 
-  go_1_18_5 = pkgs.go;
+  go_1_20_3 = pkgs.go;
 
 in mkShell {
   buildInputs = [
     docker-compose
     git
     gnumake
     gnused
-    go_1_18_5
+    go_1_20_3
     jq
     nixfmt
     nodePackages.prettier