From a4d78159c24d90615362e1700cf74a1e5d1e7a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafael@rubyonrails.org>
Date: Tue, 23 Apr 2024 17:41:15 +0000
Subject: [PATCH] Make sure we checkout back to main before exiting the task

Otherwise the custom action will not be found.
---
 .github/actions/build-and-publish-image/action.yml | 7 +++++--
 .github/workflows/publish-new-image-version.yaml   | 4 ++--
 .github/workflows/publish-new-ruby-versions.yml    | 4 ++--
 .github/workflows/release-features.yaml            | 2 +-
 .github/workflows/test-ruby-feature.yaml           | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/actions/build-and-publish-image/action.yml b/.github/actions/build-and-publish-image/action.yml
index 2434b1d..641f534 100644
--- a/.github/actions/build-and-publish-image/action.yml
+++ b/.github/actions/build-and-publish-image/action.yml
@@ -13,7 +13,7 @@ runs:
   using: "composite"
   steps:
     - name: Checkout (GitHub)
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: ${{ inputs.image_tag }}
 
@@ -46,4 +46,7 @@ runs:
         imageTag: ${{ env.IMAGE_VERSION }}-${{ inputs.ruby_version }},${{ inputs.ruby_version }}
         subFolder: images/ruby
         push: always
-        platform: linux/amd64,linux/arm64
\ No newline at end of file
+        platform: linux/amd64,linux/arm64
+
+    - name: Checkout (GitHub)
+      uses: actions/checkout@v4
diff --git a/.github/workflows/publish-new-image-version.yaml b/.github/workflows/publish-new-image-version.yaml
index dae749c..538bfaa 100644
--- a/.github/workflows/publish-new-image-version.yaml
+++ b/.github/workflows/publish-new-image-version.yaml
@@ -40,7 +40,7 @@ jobs:
       packages: write
     steps:
       - name: Checkout (GitHub)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build and Publish Image
         uses: ./.github/actions/build-and-publish-image
@@ -48,4 +48,4 @@ jobs:
           ruby_version: ${{ matrix.RUBY_VERSION }}
           image_tag:  ${{ github.ref_name }}
           gh_token: ${{ secrets.GITHUB_TOKEN }}
-          repository_owner: ${{ github.repository_owner }}
\ No newline at end of file
+          repository_owner: ${{ github.repository_owner }}
diff --git a/.github/workflows/publish-new-ruby-versions.yml b/.github/workflows/publish-new-ruby-versions.yml
index da4ecc0..6bfd1a9 100644
--- a/.github/workflows/publish-new-ruby-versions.yml
+++ b/.github/workflows/publish-new-ruby-versions.yml
@@ -28,7 +28,7 @@ jobs:
       packages: write
     steps:
       - name: Checkout (GitHub)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build and Publish Image
         uses: ./.github/actions/build-and-publish-image
@@ -36,4 +36,4 @@ jobs:
           ruby_version: ${{ matrix.RUBY_VERSION }}
           image_tag:  ${{ matrix.IMAGE_VERSION }}
           gh_token: ${{ secrets.GITHUB_TOKEN }}
-          repository_owner: ${{ github.repository_owner }}
\ No newline at end of file
+          repository_owner: ${{ github.repository_owner }}
diff --git a/.github/workflows/release-features.yaml b/.github/workflows/release-features.yaml
index a2f8a85..7ea4c95 100644
--- a/.github/workflows/release-features.yaml
+++ b/.github/workflows/release-features.yaml
@@ -12,7 +12,7 @@ jobs:
     permissions:
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Publish"
         uses: devcontainers/action@v1
diff --git a/.github/workflows/test-ruby-feature.yaml b/.github/workflows/test-ruby-feature.yaml
index 201c7a4..785d77e 100644
--- a/.github/workflows/test-ruby-feature.yaml
+++ b/.github/workflows/test-ruby-feature.yaml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout (GitHub)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: docker/login-action@v2
         with: