Skip to content

Commit

Permalink
Trigger Heroku-24 builds
Browse files Browse the repository at this point in the history
  • Loading branch information
edmorley committed May 2, 2024
1 parent 31ab18c commit 9470579
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 22 deletions.
22 changes: 2 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand All @@ -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
Expand All @@ -53,9 +38,6 @@ 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')
- name: Convert docker image and for Git tags release to Heroku staging
run: bin/convert-and-publish-to-heroku.sh
if: always()
4 changes: 2 additions & 2 deletions bin/publish-to-registries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}" ""
Expand Down

0 comments on commit 9470579

Please sign in to comment.