diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1e545df..6b1fcb1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,37 +24,48 @@ env: jobs: precommit: name: Pre-commit Check - runs-on: ubuntu-22.04 + runs-on: + - nscloud-ubuntu-22.04-amd64-4x8-with-cache + - nscloud-cache-size-50gb + - nscloud-cache-tag-sulfone-zinc-nix-store-cache + - nscloud-git-mirror-1gb steps: - - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main + # Setup + - uses: AtomiCloud/actions.setup-nix@v1.1.0 + - uses: AtomiCloud/actions.cache-nuget@v1.0.1 + + # Action - name: Run pre-commit run: nix develop .#ci -c ./scripts/ci/pre-commit.sh build: name: Build Docker + permissions: + contents: read + id-token: write + packages: write runs-on: ubuntu-22.04 strategy: matrix: configs: - - image-name: api-amd + - image-name: api dockerfile: ./infra/Dockerfile context: . - platform: linux/amd64 - - image-name: migrate-amd + platform: linux/amd64,linux/arm64 + - image-name: migrate dockerfile: ./infra/migrate.Dockerfile context: . - platform: linux/amd64 + platform: linux/amd64,linux/arm64 env: STRAT_DOCKER_IMAGE: ${{ matrix.configs.image-name }} STRAT_DOCKERFILE: ${{ matrix.configs.dockerfile }} STRAT_DOCKER_CONTEXT: ${{ matrix.configs.context }} STRAT_DOCKER_PLATFORM: ${{ matrix.configs.platform }} steps: - - uses: actions/checkout@v4 + # Setup + - uses: AtomiCloud/actions.setup-docker@v1.2.0 + + # Action - uses: rlespinasse/github-slug-action@v3.x - - uses: docker/setup-buildx-action@v3 - - uses: docker/setup-qemu-action@v3 - name: Build and Push Docker run: ./scripts/ci/ci-docker.sh env: @@ -83,13 +94,17 @@ jobs: publish: name: Publish Helm needs: build - runs-on: ubuntu-22.04 + runs-on: + - nscloud-ubuntu-22.04-amd64-4x8-with-cache + - nscloud-cache-size-50gb + - nscloud-cache-tag-sulfone-zinc-nix-store-cache + - nscloud-git-mirror-1gb steps: - - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - uses: rlespinasse/github-slug-action@v3.x + # Setup + - uses: AtomiCloud/actions.setup-nix@v1.1.0 + # Action + - uses: rlespinasse/github-slug-action@v3.x - name: Publish env: GITHUB_REPO_REF: ${{ github.repository }} @@ -106,16 +121,21 @@ jobs: release: name: Semantic Release needs: - - publish + - build - precommit if: github.ref == 'refs/heads/main' - runs-on: ubuntu-latest + runs-on: + - nscloud-ubuntu-22.04-amd64-4x8-with-cache + - nscloud-cache-size-50gb + - nscloud-cache-tag-releaser-sulfone-zinc-nix-store-cache + - nscloud-git-mirror-1gb steps: - - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - uses: rlespinasse/github-slug-action@v3.x + # Setup + - uses: AtomiCloud/actions.setup-nix@v1.1.0 + - uses: AtomiCloud/actions.cache-npm@v1.0.1 + # Action + - uses: rlespinasse/github-slug-action@v3.x - name: Release env: GITHUB_REPO_REF: ${{ github.repository }} diff --git a/flake.lock b/flake.lock index 4c7432f..777d9d1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,37 +1,65 @@ { "nodes": { "atomipkgs": { + "inputs": { + "dev-atomi": "dev-atomi", + "dev-atomi_classic": "dev-atomi_classic_2", + "dev-npkgs": "dev-npkgs_2", + "dev-npkgs-unstable-05-Oct-2022": "dev-npkgs-unstable-05-Oct-2022_2", + "dev-npkgs-unstable-07-Feb-2024": "dev-npkgs-unstable-07-Feb-2024_2", + "dev-npkgs-unstable-11-Dec-2022": "dev-npkgs-unstable-11-Dec-2022_2", + "fenix": "fenix_2", + "flake-utils": "flake-utils_4", + "npkgs": "npkgs_2", + "npkgs-unstable": "npkgs-unstable_2" + }, + "locked": { + "lastModified": 1707362469, + "narHash": "sha256-rRk9DPJv0xdQrraAbYtP1yivcH5Mz4HhheWKroj/HTc=", + "owner": "kirinnee", + "repo": "test-nix-repo", + "rev": "6ff86a09a767d3e0d20994213e43de507c8a8c37", + "type": "github" + }, + "original": { + "owner": "kirinnee", + "ref": "v23.0.1", + "repo": "test-nix-repo", + "type": "github" + } + }, + "dev-atomi": { "inputs": { "dev-atomi_classic": "dev-atomi_classic", "dev-npkgs": "dev-npkgs", "dev-npkgs-unstable-05-Oct-2022": "dev-npkgs-unstable-05-Oct-2022", + "dev-npkgs-unstable-07-Feb-2024": "dev-npkgs-unstable-07-Feb-2024", "dev-npkgs-unstable-11-Dec-2022": "dev-npkgs-unstable-11-Dec-2022", - "dev-npkgs-unstable-20-Sep-2023": "dev-npkgs-unstable-20-Sep-2023", "fenix": "fenix", "flake-utils": "flake-utils_2", "npkgs": "npkgs", "npkgs-unstable": "npkgs-unstable" }, "locked": { - "lastModified": 1697772481, - "narHash": "sha256-cuYZaAXo+kcned3PWH4RiMluqdaBRy5wGsNSjbpWe+k=", + "lastModified": 1707319132, + "narHash": "sha256-L5ekxE6MeA7URMF9M4Gdal5a5fSKAzCGyXGSepI8ozA=", "owner": "kirinnee", "repo": "test-nix-repo", - "rev": "4d3f6e049e1e2ad37d3ec5724d9e7df452294eac", + "rev": "099b7e7850d00d0e376aade2b9ad62683e6440a5", "type": "github" }, "original": { "owner": "kirinnee", - "ref": "v22.0.1", + "ref": "v23.0.0", "repo": "test-nix-repo", "type": "github" } }, - "atomipkgs_classic": { + "dev-atomi_classic": { "inputs": { - "flake-utils": "flake-utils_3", - "pkgs": "pkgs_2", - "pkgs_25_Jul_2021": "pkgs_25_Jul_2021_2" + "flake-utils": "flake-utils", + "pkgs": "pkgs", + "pkgs_25_Jul_2021": "pkgs_25_Jul_2021" }, "locked": { "lastModified": 1689236000, @@ -48,11 +76,11 @@ "type": "github" } }, - "dev-atomi_classic": { + "dev-atomi_classic_2": { "inputs": { - "flake-utils": "flake-utils", - "pkgs": "pkgs", - "pkgs_25_Jul_2021": "pkgs_25_Jul_2021" + "flake-utils": "flake-utils_3", + "pkgs": "pkgs_2", + "pkgs_25_Jul_2021": "pkgs_25_Jul_2021_2" }, "locked": { "lastModified": 1689236000, @@ -71,11 +99,11 @@ }, "dev-npkgs": { "locked": { - "lastModified": 1689048911, - "narHash": "sha256-pODI2CkjWbSLo5nPMZoLtkRNJU/Nr3VSITXZqqmNtIk=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8163a64662b43848802092d52015ef60777d6129", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -100,6 +128,51 @@ "type": "indirect" } }, + "dev-npkgs-unstable-05-Oct-2022_2": { + "locked": { + "lastModified": 1664847737, + "narHash": "sha256-Wxl0CtRH3Vo8+qEZ/PbCcx+9D8wEEi56tJPmROum2ss=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "de80d1d04ee691279e1302a1128c082bbda3ab01", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "de80d1d04ee691279e1302a1128c082bbda3ab01", + "type": "indirect" + } + }, + "dev-npkgs-unstable-07-Feb-2024": { + "locked": { + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "type": "indirect" + } + }, + "dev-npkgs-unstable-07-Feb-2024_2": { + "locked": { + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "type": "indirect" + } + }, "dev-npkgs-unstable-11-Dec-2022": { "locked": { "lastModified": 1670681895, @@ -115,32 +188,67 @@ "type": "indirect" } }, - "dev-npkgs-unstable-20-Sep-2023": { + "dev-npkgs-unstable-11-Dec-2022_2": { "locked": { - "lastModified": 1694959747, - "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", + "lastModified": 1670681895, + "narHash": "sha256-kZH9DSU36W4fn1z81a/24JCGkU517TcY50VE0RFJ9k4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "rev": "f82f0ec1b70b2879c3f3d9a1015a05c73a90a17c", "type": "github" }, "original": { "id": "nixpkgs", - "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "rev": "f82f0ec1b70b2879c3f3d9a1015a05c73a90a17c", "type": "indirect" } }, + "dev-npkgs_2": { + "locked": { + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": "nixpkgs", "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1695363721, - "narHash": "sha256-+VRVzXpWdSsZPcR2Cg9Q5LKhUQDVvoQFfH4V8iKNAkU=", + "lastModified": 1706941198, + "narHash": "sha256-t6/qloMYdknVJ9a3QzjylQIZnQfgefJ5kMim50B7dwA=", + "owner": "nix-community", + "repo": "fenix", + "rev": "28dbd8b43ea328ee708f7da538c63e03d5ed93c8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_2": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1706941198, + "narHash": "sha256-t6/qloMYdknVJ9a3QzjylQIZnQfgefJ5kMim50B7dwA=", "owner": "nix-community", "repo": "fenix", - "rev": "cb59ad177b991978ff571388bf8df6fed32e6bc2", + "rev": "28dbd8b43ea328ee708f7da538c63e03d5ed93c8", "type": "github" }, "original": { @@ -152,11 +260,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -188,11 +296,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -224,11 +332,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -242,11 +350,29 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -263,11 +389,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "type": "github" }, "original": { @@ -278,11 +404,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695145219, - "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", + "lastModified": 1706732774, + "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", + "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", "type": "github" }, "original": { @@ -294,11 +420,11 @@ }, "nixpkgs-2305": { "locked": { - "lastModified": 1697777081, - "narHash": "sha256-n2vQARhKevRGyeo+LAa8g+CdUQsdH/caNk8jnylcPhY=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "679cadfdfed2b90311a247b2d6ef6dfd3d6cab73", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -307,38 +433,54 @@ "type": "indirect" } }, - "nixpkgs-oct-21-23": { + "nixpkgs-feb-23-24": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { "id": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "indirect" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { + "locked": { + "lastModified": 1706732774, + "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1694343207, "narHash": "sha256-jWi7OwFxU5Owi4k2JmiL1sa/OuBCQtpaAesuj5LXC8w=", @@ -353,13 +495,13 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1689261696, - "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { @@ -369,13 +511,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1695644571, - "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { @@ -387,11 +529,11 @@ }, "npkgs": { "locked": { - "lastModified": 1689048911, - "narHash": "sha256-pODI2CkjWbSLo5nPMZoLtkRNJU/Nr3VSITXZqqmNtIk=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8163a64662b43848802092d52015ef60777d6129", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -403,11 +545,27 @@ }, "npkgs-unstable": { "locked": { - "lastModified": 1689008574, - "narHash": "sha256-VFMgyHDiqsGDkRg73alv6OdHJAqhybryWHv77bSCGIw=", + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "npkgs-unstable_2": { + "locked": { + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4a729ce4b1fe5ec4fffc71c67c96aa5184ebb462", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", "type": "github" }, "original": { @@ -417,6 +575,22 @@ "type": "github" } }, + "npkgs_2": { + "locked": { + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "pkgs": { "locked": { "lastModified": 1643805626, @@ -480,17 +654,17 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1697746376, - "narHash": "sha256-gu77VkgdfaHgNCVufeb6WP9oqFLjwK4jHcoPZmBVF3E=", + "lastModified": 1708018599, + "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "8cc349bfd082da8782b989cad2158c9ad5bd70fd", + "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", "type": "github" }, "original": { @@ -502,11 +676,10 @@ "root": { "inputs": { "atomipkgs": "atomipkgs", - "atomipkgs_classic": "atomipkgs_classic", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_2", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_3", "nixpkgs-2305": "nixpkgs-2305", - "nixpkgs-oct-21-23": "nixpkgs-oct-21-23", + "nixpkgs-feb-23-24": "nixpkgs-feb-23-24", "pre-commit-hooks": "pre-commit-hooks", "treefmt-nix": "treefmt-nix" } @@ -514,11 +687,28 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1695220688, - "narHash": "sha256-T54aKrnKMI7Cg2mid5h46mWAXd0xc0pYn0fju3dwXf0=", + "lastModified": 1706875368, + "narHash": "sha256-KOBXxNurIU2lEmO6lR2A5El32X9x8ITt25McxKZ/Ew0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "d6fef2c7e3be2783369b4b84e320b163b8fd291a", + "rev": "8f6a72871ec87ed53cfe43a09fb284168a284e7e", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1706875368, + "narHash": "sha256-KOBXxNurIU2lEmO6lR2A5El32X9x8ITt25McxKZ/Ew0=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "8f6a72871ec87ed53cfe43a09fb284168a284e7e", "type": "github" }, "original": { @@ -603,16 +793,31 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1697388351, - "narHash": "sha256-63N2eBpKaziIy4R44vjpUu8Nz5fCJY7okKrkixvDQmY=", + "lastModified": 1708681819, + "narHash": "sha256-+YIvy0dDZw8KIFVPS9i+mTHf2RqSJ0+dBB9AXBvDTks=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "aae39f64f5ecbe89792d05eacea5cb241891292a", + "rev": "36fd6923c122a983bc3915692e6cb3ff341ef083", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1636be4..892c8e3 100644 --- a/flake.nix +++ b/flake.nix @@ -8,9 +8,8 @@ # registry nixpkgs.url = "nixpkgs/78058d810644f5ed276804ce7ea9e82d92bee293"; nixpkgs-2305.url = "nixpkgs/nixos-23.05"; - nixpkgs-oct-21-23.url = "nixpkgs/7c9cc5a6e5d38010801741ac830a3f8fd667a7a0"; - atomipkgs.url = "github:kirinnee/test-nix-repo/v22.0.1"; - atomipkgs_classic.url = "github:kirinnee/test-nix-repo/classic"; + nixpkgs-feb-23-24.url = "nixpkgs/0e74ca98a74bc7270d28838369593635a5db3260"; + atomipkgs.url = "github:kirinnee/test-nix-repo/v23.0.1"; }; outputs = @@ -23,10 +22,9 @@ # registries , atomipkgs - , atomipkgs_classic , nixpkgs , nixpkgs-2305 - , nixpkgs-oct-21-23 + , nixpkgs-feb-23-24 } @inputs: (flake-utils.lib.eachDefaultSystem @@ -35,9 +33,8 @@ let pkgs = nixpkgs.legacyPackages.${system}; pkgs-2305 = nixpkgs-2305.legacyPackages.${system}; - pkgs-oct-21-23 = nixpkgs-oct-21-23.legacyPackages.${system}; + pkgs-feb-23-24 = nixpkgs-feb-23-24.legacyPackages.${system}; atomi = atomipkgs.packages.${system}; - atomi_classic = atomipkgs_classic.packages.${system}; pre-commit-lib = pre-commit-hooks.lib.${system}; in with rec { @@ -49,7 +46,7 @@ }; packages = import ./nix/packages.nix { - inherit pkgs pkgs-2305 atomi atomi_classic pkgs-oct-21-23; + inherit pkgs pkgs-2305 atomi pkgs-feb-23-24; }; env = import ./nix/env.nix { inherit pkgs packages; diff --git a/nix/packages.nix b/nix/packages.nix index e37e7c2..1dbc5ef 100644 --- a/nix/packages.nix +++ b/nix/packages.nix @@ -1,21 +1,15 @@ -{ pkgs, pkgs-2305, atomi, atomi_classic, pkgs-oct-21-23 }: +{ pkgs, pkgs-2305, atomi, pkgs-feb-23-24 }: let all = { - atomipkgs_classic = ( - with atomi_classic; - { - inherit - sg; - } - ); atomipkgs = ( with atomi; { inherit infisical mirrord - pls; + pls + sg; } ); nix-2305 = ( @@ -27,8 +21,8 @@ let hadolint; } ); - oct-21-23 = ( - with pkgs-oct-21-23; + feb-23-24 = ( + with pkgs-feb-23-24; { nodejs = nodejs_20; helm = kubernetes-helm; @@ -65,5 +59,4 @@ in with all; nix-2305 // atomipkgs // -atomipkgs_classic // -oct-21-23 +feb-23-24 diff --git a/scripts/ci/ci-docker.sh b/scripts/ci/ci-docker.sh index 3e8ebcf..da939cc 100755 --- a/scripts/ci/ci-docker.sh +++ b/scripts/ci/ci-docker.sh @@ -86,10 +86,11 @@ docker buildx build \ -f "${CI_DOCKERFILE}" \ --platform=${CI_DOCKER_PLATFORM} \ --push \ - --cache-from "type=s3,endpoint_url=${S3_URL},region=${S3_REGION},bucket=${S3_BUCKET},name=${CACHE_COMMIT}" \ - --cache-from "type=s3,endpoint_url=${S3_URL},region=${S3_REGION},bucket=${S3_BUCKET},name=${CACHE_BRANCH}" \ - --cache-from "type=s3,endpoint_url=${S3_URL},region=${S3_REGION},bucket=${S3_BUCKET},name=${CACHE_LATEST}" \ - --cache-to "type=s3,endpoint_url=${S3_URL},region=${S3_REGION},bucket=${S3_BUCKET},ref=${CACHE_COMMIT};${CACHE_BRANCH};${CACHE_LATEST},mode=max" \ -t "${COMMIT_IMAGE_REF}" $args \ -t "${BRANCH_IMAGE_REF}" echo "✅ Pushed branch image!" + +# --cache-from "type=s3,endpoint_url=${S3_URL},region=${S3_REGION},bucket=${S3_BUCKET},name=${CACHE_COMMIT}" \ +# --cache-from "type=s3,endpoint_url=${S3_URL},region=${S3_REGION},bucket=${S3_BUCKET},name=${CACHE_BRANCH}" \ +# --cache-from "type=s3,endpoint_url=${S3_URL},region=${S3_REGION},bucket=${S3_BUCKET},name=${CACHE_LATEST}" \ +# --cache-to "type=s3,endpoint_url=${S3_URL},region=${S3_REGION},bucket=${S3_BUCKET},ref=${CACHE_COMMIT};${CACHE_BRANCH};${CACHE_LATEST},mode=max" \ diff --git a/scripts/ci/release.sh b/scripts/ci/release.sh index 9207ced..2e5c299 100755 --- a/scripts/ci/release.sh +++ b/scripts/ci/release.sh @@ -1,3 +1,3 @@ #! /bin/sh rm .git/hooks/* -sg release || true +sg release -i npm || true