From a341be4d9b8ed69322a281613c2ef7135d9d4578 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.helbling@determinate.systems>
Date: Fri, 21 Feb 2025 13:33:56 -0800
Subject: [PATCH] fixup: fold publish.yml into upload-release.yml

---
 .github/workflows/publish.yml        | 23 -----------------------
 .github/workflows/upload-release.yml | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 23 deletions(-)
 delete mode 100644 .github/workflows/publish.yml

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index 00ca3ec53..000000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Release
-
-on:
-  release:
-    types:
-      - released
-
-jobs:
-  publish:
-    if: (!github.repository.fork && (github.ref == format('refs/heads/{0}', github.event.repository.default_branch) || startsWith(github.ref, 'refs/tags/')))
-    environment: ${{ github.event_name == 'release' && 'production' || '' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-    steps:
-      - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
-      - uses: "DeterminateSystems/flakehub-push@main"
-        with:
-          rolling: ${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
-          visibility: "private"
-          tag: "${{ github.ref_name }}"
diff --git a/.github/workflows/upload-release.yml b/.github/workflows/upload-release.yml
index 6fbf33420..5e09c010c 100644
--- a/.github/workflows/upload-release.yml
+++ b/.github/workflows/upload-release.yml
@@ -83,3 +83,21 @@ jobs:
           ids_project_name: determinate-nix
           ids_binary_prefix: determinate-nix
           skip_acl: true
+
+  publish:
+    needs:
+      - release
+    if: (!github.repository.fork && (github.ref == format('refs/heads/{0}', github.event.repository.default_branch) || startsWith(github.ref, 'refs/tags/')))
+    environment: ${{ github.event_name == 'release' && 'production' || '' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: "DeterminateSystems/flakehub-push@main"
+        with:
+          rolling: ${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
+          visibility: "private"
+          tag: "${{ github.ref_name }}"