feat ✨: ci push kaasix close #161

Signed-off-by: Victor Hang <[email protected]>
didactiklabs · Jan 26, 2025 · b433bfd · b433bfd
2 parents 760cd9e + f222dbe
commit b433bfd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/.github/workflows/build-kaasix.yaml b/.github/workflows/build-kaasix.yaml
@@ -25,18 +25,8 @@ jobs:
   build:
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-    runs-on: ubuntu-latest
+    runs-on: didactiklabs-runners
     steps:
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: true
-          dotnet: true
-          haskell: false
-          large-packages: false
-          docker-images: false
-          swap-storage: true
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Set output
@@ -54,6 +44,7 @@ jobs:
             fallback = true
             trusted-public-keys = didactiklabs-nixcache:PxLKN0+ZkP07M8g8/B6xbP6A4MYpqQg6LH7V3muiy/0= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
             substituters = https://s3.didactiklabs.io/nix-cache https://cache.nixos.org/
+            system-features = nixos-test benchmark big-parallel kvm
       - name: Auth to s3 cache
         run: |
           aws --profile default configure set aws_access_key_id "${{ secrets.AWS_ACCESS_KEY_ID }}"
@@ -64,11 +55,16 @@ jobs:
         uses: 'google-github-actions/auth@v2'
         with:
           credentials_json: '${{ secrets.GCLOUD_AUTH_CREDENTIAL_FILE }}'
+      - name: 'Set up Cloud SDK'
+        uses: 'google-github-actions/setup-gcloud@v2'
+        with:
+          version: '>= 363.0.0'
       - name: Build and Push
         run: |
+          chmod o+rx /home/runner -R
           nix-shell shell.nix --run "buildOciQcow2 kaasix"
           gcloud auth configure-docker gcr.io --quiet
-          skopeo --version
-          skopeo copy \
+          nix run nixpkgs#skopeo --version
+          nix run nixpkgs#skopeo copy --insecure-policy \
           docker-archive:output/kaasix-qcow2-oci.tar \
           docker://gcr.io/${{ secrets.GCLOUD_PROJECT }}/kaasix-$(nix eval --raw -f . nixosSystem.config.customNixOSModules.kubernetes.version.kubeadm --argstr profile kaasix):${{ steps.vars.outputs.tag }}
diff --git a/npins/sources.json b/npins/sources.json
@@ -155,9 +155,9 @@
         "repo": "nixbook"
       },
       "branch": "main",
-      "revision": "ed80a950c524fb16c64463da8f04fafa43dffcd7",
-      "url": "https://github.com/didactiklabs/nixbook/archive/ed80a950c524fb16c64463da8f04fafa43dffcd7.tar.gz",
-      "hash": "1hkg85i28hrd3yypfi42a8fh2iaanvqx35f088aas0z3d7mrb7sw"
+      "revision": "9af26c10f34c9ba5d58aeb16e6ff57af29be101e",
+      "url": "https://github.com/didactiklabs/nixbook/archive/9af26c10f34c9ba5d58aeb16e6ff57af29be101e.tar.gz",
+      "hash": "1q9h1np7fds3x3r5zv7p5mi6ckwhbg49m0wngyirsw6azkq8nldl"
     },
     "nixpkgs": {
       "type": "Git",
@@ -167,9 +167,9 @@
         "repo": "nixpkgs"
       },
       "branch": "nixos-24.11",
-      "revision": "47addd76727f42d351590c905d9d1905ca895b82",
-      "url": "https://github.com/NixOS/nixpkgs/archive/47addd76727f42d351590c905d9d1905ca895b82.tar.gz",
-      "hash": "0wvzgvqgd83yab62i930nl4byj3zwbdw2cnk9x0lp6ch9nk399pa"
+      "revision": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
+      "url": "https://github.com/NixOS/nixpkgs/archive/035f8c0853c2977b24ffc4d0a42c74f00b182cd8.tar.gz",
+      "hash": "10mkjpj3wigr6w5azrq0nf784kncf6pplm075ndniakhbwkwjwb2"
     }
   },
   "version": 3