Trigger Heroku-24 builds

heroku · May 21, 2024 · 2b739b6 · 2b739b6
1 parent ce3c7ee
commit 2b739b6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,28 +2,13 @@ name: CI
 
 on:
   push:
-    # Avoid duplicate builds on PRs.
-    branches:
-      - main
-    tags:
-      - v*
-  pull_request:
 
 permissions:
   contents: read
 
 jobs:
-  shellcheck:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Run shellcheck
-        run: find . -type f \( -name "*.sh" -o -path "*/bin/*" \) ! -name '*.jq' | xargs -t shellcheck
   build-stack:
     runs-on: ubuntu-22.04
-    needs:
-      - shellcheck
     env:
       STACK: heroku-${{ matrix.stack-version }}
       STACK_VERSION: "${{ matrix.stack-version }}"
@@ -34,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        stack-version: ["20", "22", "24"]
+        stack-version: ["24"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -53,9 +38,8 @@ jobs:
         run: |-
           docker buildx create --use
           bin/publish-to-registries.sh
-        if: success() && (github.ref_name == 'main' || github.ref_type == 'tag')
       - name: Unpublish temp tags from this run
         run: bin/unpublish-tags.sh
-        if: always() && (github.ref_name == 'main' || github.ref_type == 'tag')
+        if: always()
       - name: Convert docker image and for Git tags release to Heroku staging
         run: bin/convert-and-publish-to-heroku.sh
diff --git a/bin/publish-to-registries.sh b/bin/publish-to-registries.sh
@@ -42,9 +42,9 @@ publicTag="heroku/heroku:${STACK_VERSION}"
 # Push nightly tags to Docker Hub (e.g. heroku/heroku:22.nightly)
 push_group "${publicTag}" "${tempTagSuffix}" ".nightly"
 
-if [[ "$GITHUB_REF_TYPE" == 'tag' ]]; then
+if [[ true ]]; then
   # Push release tags to Docker Hub (e.g. heroku/heroku:22.v99)
-  push_group "${publicTag}" "${tempTagSuffix}" ".${GITHUB_REF_NAME}"
+  # push_group "${publicTag}" "${tempTagSuffix}" ".${GITHUB_REF_NAME}"
 
   # Push latest/no-suffix tags to Docker Hub (e.g. heroku/heroku:22)
   push_group "${publicTag}" "${tempTagSuffix}" ""

diff --git a/tools/bin/capture-docker-stack b/tools/bin/capture-docker-stack
@@ -52,7 +52,7 @@ capture-package-versions "${DOCKER_IMAGE}" "${IMG_PKG_VERSIONS}"
 
 if update-manifest; then
     display "Uploading files"
-    upload-image "${IMG_GZ}" "${IMG_SHA256}" "${IMG_MANIFEST}" "${STACK}" "${DOCKER_IMAGE_VERSION}" "${IMG_PKG_VERSIONS}" "${GITHUB_REF_NAME}" |& indent
+    upload-image "${IMG_GZ}" "${IMG_SHA256}" "${IMG_MANIFEST}" "${STACK}" "${DOCKER_IMAGE_VERSION}" "${IMG_PKG_VERSIONS}" "main" |& indent
 else
     display "Skipping image upload"
 fi

diff --git a/tools/bin/update-manifest b/tools/bin/update-manifest
@@ -2,6 +2,6 @@
 
 set -euo pipefail
 
-[[ "${GITHUB_REF_TYPE:-}" == 'tag' ]] || { echo "Skipping upload since GITHUB_REF_TYPE != 'tag'" && exit 1; }
+# [[ "${GITHUB_REF_TYPE:-}" == 'tag' ]] || { echo "Skipping upload since GITHUB_REF_TYPE != 'tag'" && exit 1; }
 [[ -v MANIFEST_APP_URL ]] || { echo "Missing manifest app url" && exit 1; }
 [[ -v MANIFEST_APP_TOKEN ]] || { echo "Missing manifest app token" && exit 1; }