Switch filename of release and publish workflows

2 files changed, 103 insertions, 103 deletions

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 5d4474d978..3caeee9a3b 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,18 +1,107 @@
-name: Start release workflow
+name: Publish Ruby packages
+
 on:
-  push:
-    tags:
-      - '*'
+  repository_dispatch:
+    types:
+      - release
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version of the Ruby package to release'
+        required: true
+        default: '3.3.4'
 
 jobs:
-  notify:
+  release:
     runs-on: ubuntu-latest
     steps:
-      - name: Build release package
+      - uses: actions/checkout@v6.0.1
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3.4
+
+      - name: Store Ruby version
+        run: |
+          echo "RUBY_VERSION=${{ github.event.client_payload.version || github.event.inputs.version }}" >> $GITHUB_ENV
+
+      - name: Store ABI version
+        run: echo "ABI_VERSION=$(echo ${{ env.RUBY_VERSION }} | cut -d '.' -f 1-2)" >> $GITHUB_ENV
+
+      - name: Copy draft package `/tmp` to `/pub` directory
+        run: tool/release.sh ${{ env.RUBY_VERSION }}
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.FTP_R_L_O_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.FTP_R_L_O_AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: us-west-2
+
+      - name: Purge URLs of release package
+        run: |
+          curl -X POST \
+            -H "Fastly-Key: ${{ secrets.FASTLY_PURGE_TOKEN }}" \
+            https://api.fastly.com/purge/cache.ruby-lang.org/pub/ruby/${{ env.ABI_VERSION }}/ruby-${{ env.RUBY_VERSION }}.tar.gz
+          curl -X POST \
+            -H "Fastly-Key: ${{ secrets.FASTLY_PURGE_TOKEN }}" \
+            https://api.fastly.com/purge/cache.ruby-lang.org/pub/ruby/${{ env.ABI_VERSION }}/ruby-${{ env.RUBY_VERSION }}.tar.xz
+          curl -X POST \
+            -H "Fastly-Key: ${{ secrets.FASTLY_PURGE_TOKEN }}" \
+            https://api.fastly.com/purge/cache.ruby-lang.org/pub/ruby/${{ env.ABI_VERSION }}/ruby-${{ env.RUBY_VERSION }}.zip
+
+      - name: Create a release on GitHub
+        run: |
+          RELEASE_TAG=$(ruby tool/ruby-version.rb tag "${{ env.RUBY_VERSION }}")
+          echo $RELEASE_TAG
+          PREVIOUS_RELEASE_TAG=$(ruby tool/ruby-version.rb previous-tag "${{ env.RUBY_VERSION }}")
+          echo $PREVIOUS_RELEASE_TAG
+          tool/gen-github-release.rb $PREVIOUS_RELEASE_TAG $RELEASE_TAG --no-dry-run
+        env:
+          GITHUB_TOKEN: ${{ secrets.MATZBOT_AUTO_UPDATE_TOKEN }}
+
+      - name: Update versions index
         run: |
           curl -L -X POST \
             -H "Authorization: Bearer ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}" \
             -H "Accept: application/vnd.github+json" \
             -H "X-GitHub-Api-Version: 2022-11-28" \
             https://api.github.com/repos/ruby/actions/dispatches \
-            -d '{"event_type": "${{ github.ref }}"}'
+            -d '{"event_type": "update_index"}'
+
+      - name: Build and push Docker images
+        run: |
+          curl -L -X POST \
+            -H "Authorization: Bearer ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}" \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/ruby/docker-images/actions/workflows/build.yml/dispatches \
+            -d '{"ref": "master", "inputs": {"ruby_version": "${{ env.RUBY_VERSION }}"}}'
+
+      - name: Build snapcraft packages
+        run: |
+          curl -L -X POST \
+            -H "Authorization: Bearer ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}" \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/ruby/snap.ruby/dispatches \
+            -d '{"event_type": "build", "client_payload": {"ruby_version": "${{ env.RUBY_VERSION }}"}}'
+
+      - name: Store the latest LTS version of OpenSSL
+        run: |
+          echo "OPENSSL_VERSION=`curl -s https://api.github.com/repos/openssl/openssl/releases | jq -r '.[].tag_name | select(startswith("openssl-3.0"))' | sort -Vr | head -n1 | cut -d'-' -f2`" >> $GITHUB_ENV
+
+      - name: Update ruby-build definition
+        run: |
+          curl -L -X POST \
+            -H "Authorization: Bearer ${{ secrets.RUBY_BUILD_WORKFLOW_TOKEN }}" \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/rbenv/ruby-build/dispatches \
+            -d '{"event_type": "update-ruby", "client_payload": {"ruby_version": "${{ env.RUBY_VERSION }}", "openssl_version": "${{ env.OPENSSL_VERSION }}"}}'
+
+      - name: Update all-ruby definition
+        run: |
+          curl -L -X POST \
+            -H "Authorization: Bearer ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}" \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/ruby/all-ruby/dispatches \
+            -d '{"event_type": "update"}'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3caeee9a3b..5d4474d978 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,107 +1,18 @@
-name: Publish Ruby packages
-
+name: Start release workflow
 on:
-  repository_dispatch:
-    types:
-      - release
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version of the Ruby package to release'
-        required: true
-        default: '3.3.4'
+  push:
+    tags:
+      - '*'
 
 jobs:
-  release:
+  notify:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6.0.1
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.3.4
-
-      - name: Store Ruby version
-        run: |
-          echo "RUBY_VERSION=${{ github.event.client_payload.version || github.event.inputs.version }}" >> $GITHUB_ENV
-
-      - name: Store ABI version
-        run: echo "ABI_VERSION=$(echo ${{ env.RUBY_VERSION }} | cut -d '.' -f 1-2)" >> $GITHUB_ENV
-
-      - name: Copy draft package `/tmp` to `/pub` directory
-        run: tool/release.sh ${{ env.RUBY_VERSION }}
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.FTP_R_L_O_AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.FTP_R_L_O_AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: us-west-2
-
-      - name: Purge URLs of release package
-        run: |
-          curl -X POST \
-            -H "Fastly-Key: ${{ secrets.FASTLY_PURGE_TOKEN }}" \
-            https://api.fastly.com/purge/cache.ruby-lang.org/pub/ruby/${{ env.ABI_VERSION }}/ruby-${{ env.RUBY_VERSION }}.tar.gz
-          curl -X POST \
-            -H "Fastly-Key: ${{ secrets.FASTLY_PURGE_TOKEN }}" \
-            https://api.fastly.com/purge/cache.ruby-lang.org/pub/ruby/${{ env.ABI_VERSION }}/ruby-${{ env.RUBY_VERSION }}.tar.xz
-          curl -X POST \
-            -H "Fastly-Key: ${{ secrets.FASTLY_PURGE_TOKEN }}" \
-            https://api.fastly.com/purge/cache.ruby-lang.org/pub/ruby/${{ env.ABI_VERSION }}/ruby-${{ env.RUBY_VERSION }}.zip
-
-      - name: Create a release on GitHub
-        run: |
-          RELEASE_TAG=$(ruby tool/ruby-version.rb tag "${{ env.RUBY_VERSION }}")
-          echo $RELEASE_TAG
-          PREVIOUS_RELEASE_TAG=$(ruby tool/ruby-version.rb previous-tag "${{ env.RUBY_VERSION }}")
-          echo $PREVIOUS_RELEASE_TAG
-          tool/gen-github-release.rb $PREVIOUS_RELEASE_TAG $RELEASE_TAG --no-dry-run
-        env:
-          GITHUB_TOKEN: ${{ secrets.MATZBOT_AUTO_UPDATE_TOKEN }}
-
-      - name: Update versions index
+      - name: Build release package
         run: |
           curl -L -X POST \
             -H "Authorization: Bearer ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}" \
             -H "Accept: application/vnd.github+json" \
             -H "X-GitHub-Api-Version: 2022-11-28" \
             https://api.github.com/repos/ruby/actions/dispatches \
-            -d '{"event_type": "update_index"}'
-
-      - name: Build and push Docker images
-        run: |
-          curl -L -X POST \
-            -H "Authorization: Bearer ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}" \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            https://api.github.com/repos/ruby/docker-images/actions/workflows/build.yml/dispatches \
-            -d '{"ref": "master", "inputs": {"ruby_version": "${{ env.RUBY_VERSION }}"}}'
-
-      - name: Build snapcraft packages
-        run: |
-          curl -L -X POST \
-            -H "Authorization: Bearer ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}" \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            https://api.github.com/repos/ruby/snap.ruby/dispatches \
-            -d '{"event_type": "build", "client_payload": {"ruby_version": "${{ env.RUBY_VERSION }}"}}'
-
-      - name: Store the latest LTS version of OpenSSL
-        run: |
-          echo "OPENSSL_VERSION=`curl -s https://api.github.com/repos/openssl/openssl/releases | jq -r '.[].tag_name | select(startswith("openssl-3.0"))' | sort -Vr | head -n1 | cut -d'-' -f2`" >> $GITHUB_ENV
-
-      - name: Update ruby-build definition
-        run: |
-          curl -L -X POST \
-            -H "Authorization: Bearer ${{ secrets.RUBY_BUILD_WORKFLOW_TOKEN }}" \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            https://api.github.com/repos/rbenv/ruby-build/dispatches \
-            -d '{"event_type": "update-ruby", "client_payload": {"ruby_version": "${{ env.RUBY_VERSION }}", "openssl_version": "${{ env.OPENSSL_VERSION }}"}}'
-
-      - name: Update all-ruby definition
-        run: |
-          curl -L -X POST \
-            -H "Authorization: Bearer ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}" \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            https://api.github.com/repos/ruby/all-ruby/dispatches \
-            -d '{"event_type": "update"}'
+            -d '{"event_type": "${{ github.ref }}"}'