diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index 5ad274c..ea25e05 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -22,13 +22,18 @@ runs: large-packages: false tool-cache: false - - uses: DeterminateSystems/nix-installer-action@main + # - uses: DeterminateSystems/nix-installer-action@main + # with: + # extra-conf: | + # accept-flake-config = true + # github_token: ${{ inputs.SECRET_GITHUB_TOKEN }} + + - uses: cachix/install-nix-action@v25 with: - extra-conf: | + github_access_token: ${{ inputs.GITHUB_TOKEN }} + extra_nix_config: | accept-flake-config = true - github_token: ${{ inputs.SECRET_GITHUB_TOKEN }} - - uses: DeterminateSystems/magic-nix-cache-action@main - name: Install nixci diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0ee5d72..b70253f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -75,5 +75,5 @@ jobs: nix build ./nix/std#x86_64-linux.repo.containers.dev.out - name: copy oci-image to the register run: | - # nix run ./nix/std#x86_64-linux.repo.containers.dev.out.copyToRegistry - nix run ./nix/std\#x86_64-linux.repo.containers.dev.out.copyTo -- docker://ghcr.io/hardenedlinux/aisecurity-research-template:latest + nix run ./nix/std#x86_64-linux.repo.containers.dev.out.copyToPodman + # nix run ./nix/std\#x86_64-linux.repo.containers.dev.out.copyTo -- docker://ghcr.io/hardenedlinux/aisecurity-research-template:latest diff --git a/nix/std/flake.lock b/nix/std/flake.lock index 2489421..b18112d 100644 --- a/nix/std/flake.lock +++ b/nix/std/flake.lock @@ -142,11 +142,11 @@ "flops": "flops" }, "locked": { - "lastModified": 1708676847, - "narHash": "sha256-mLxQ+R+w710IZLkis8/Kc6z+81cS5Czd/ubAs0v9GTQ=", + "lastModified": 1708755048, + "narHash": "sha256-AwZRp0JtZZxhgKaanHSPv/JU2hf4Db+uh0ecZCxSYis=", "owner": "gtrunsec", "repo": "omnibus", - "rev": "99ee35d2ff66fd9aa94f26dfd618a984f0f6a9e3", + "rev": "5e7ec2a595961e7718aa684bf1d1a2e0f7f5fa71", "type": "github" }, "original": {