fix(ci): pull flyctl from Nix

msfjarvis · Dec 20, 2024 · bbc0fd2 · bbc0fd2
1 parent 8cdbd6b
commit bbc0fd2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,9 +19,6 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-    - name: Set up flyctl
-      uses: superfly/flyctl-actions/setup-flyctl@master
-
     - name: Install Nix
       uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
       with:
@@ -59,7 +56,7 @@ jobs:
           docker://registry.fly.io/linkleaner:latest \
           --dest-creds x:"$FLY_API_TOKEN" \
           --format v2s2
-        flyctl deploy
+        nix run .#flyctl deploy
 
     - name: Log in to GitHub Container Registry
       uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3

diff --git a/flake.nix b/flake.nix
@@ -24,7 +24,6 @@
 
   outputs =
     {
-      self,
       nixpkgs,
       advisory-db,
       crane,
@@ -99,8 +98,8 @@
             ;
         };
 
-        # Expose the skopeo package for use in CI
-        packages.skopeo = pkgs.skopeo;
+        # Expose the flyctl and skopeo packages for use in CI
+        packages = { inherit (pkgs) flyctl skopeo; };
         packages.default = linkleaner;
         packages.container = pkgs.dockerTools.buildImage {
           name = "registry.fly.io/linkleaner";