From 109b17658053c1fddfd9b0a0176f246439be5f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tommi=20M=C3=A4klin?= <tommi@maklin.fi>
Date: Thu, 19 Sep 2024 10:54:39 +0300
Subject: [PATCH] Merge all jobs.

---
 .github/workflows/make_release.yml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/make_release.yml b/.github/workflows/make_release.yml
index 667320e..93adfb9 100644
--- a/.github/workflows/make_release.yml
+++ b/.github/workflows/make_release.yml
@@ -11,8 +11,8 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  download-prebuilt-artifacts:
-    name: Download artifacts from build_artifacts.yml
+  create-release:
+    name: Create and publish release
     runs-on: ubuntu-latest
 
     steps:
@@ -22,12 +22,6 @@ jobs:
           workflow: build_artifacts.yml
           workflow_conclusion: success
 
-  create-release:
-    name: Create release files
-    runs-on: ubuntu-latest
-    needs: download-prebuilt-artifacts
-
-    steps:
       - name: Organise files
         shell: bash
         run: |
@@ -49,12 +43,6 @@ jobs:
           mv sablast-candidate-x86_64-apple-darwin.tar.gz sablast-${{ github.ref_name }}-x86_64-apple-darwin.tar.gz
           mv sablast-candidate-aarch64-apple-darwin.tar.gz sablast-${{ github.ref_name }}-aarch64-apple-darwin.tar.gz
 
-  publish-release:
-    name: Publish release files
-    runs-on: ubuntu-latest
-    needs: create-release
-
-    steps:
       - name: Get current date
         id: date
         run: echo "::set-output name=date::$(date +'%d %B %Y')