Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add back labeled builds #1072

Merged
merged 12 commits into from
Mar 7, 2025
21 changes: 18 additions & 3 deletions .github/workflows/build-push-containers-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,25 @@ on:
- opened
- synchronize
push:
branches:
- '**'
tags:
- '[0-9]*.[0-9]*.[0-9]*'

jobs:

read-github-context-object:
runs-on: ubuntu-latest
steps:
# I know this is not pretty (debug information) but it's useful to have this
- name: Read github context
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: |
echo "GITHUB_SHA=${GITHUB_SHA}"
echo "INFO: github context object content below"
echo "${GITHUB_CONTEXT}"

build-push-checked-containers:
if: contains(github.event.pull_request.labels.*.name, 'cicd:movement-containers') || github.ref == 'refs/heads/main' || github.event.label.name == 'cicd:movement-containers'
uses: ./.github/workflows/build-push-container.yml
name: Build Push Checked Containers
secrets: inherit
Expand All @@ -36,6 +48,7 @@ jobs:
container_name: ${{ matrix.container_name }}

build-push-checked-manifest:
if: contains(github.event.pull_request.labels.*.name, 'cicd:movement-containers') || github.ref == 'refs/heads/main' || github.event.label.name == 'cicd:movement-containers'
uses: ./.github/workflows/build-push-manifest.yml
name: Build Push Checked Manifest
needs:
Expand All @@ -60,7 +73,7 @@ jobs:

container-checks:
if: contains(github.event.pull_request.labels.*.name, 'cicd:movement-containers') || github.ref == 'refs/heads/main' || github.event.label.name == 'cicd:movement-containers'
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: buildjet-16vcpu-ubuntu-2204
needs:
- build-push-checked-manifest
steps:
Expand Down Expand Up @@ -110,6 +123,8 @@ jobs:
### Unchecked containers

build-push-unchecked-containers:
if: contains(github.event.pull_request.labels.*.name, 'cicd:bridge-containers') || github.ref == 'refs/heads/main' || github.event.label.name == 'cicd:bridge-containers'

uses: ./.github/workflows/build-push-container.yml
name: Build Push Unchecked Containers
secrets: inherit
Expand Down
41 changes: 27 additions & 14 deletions .github/workflows/checks-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,38 @@ on:
- opened
- synchronize
push:
branches:
- '**'
tags:
- '[0-9]*.[0-9]*.[0-9]*'

jobs:


read-github-context-object:
runs-on: ubuntu-latest
steps:
# I know this is not pretty (debug information) but it's useful to have this
- name: Read github context
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: |
echo "GITHUB_SHA=${GITHUB_SHA}"
echo "INFO: github context object content below"
echo "${GITHUB_CONTEXT}"

build:
strategy:
matrix:
include:
- os: ubuntu-22.04
arch: x86_64
runs-on: buildjet-8vcpu-ubuntu-2204
- os: macos-13-latest
runs-on: buildjet-16vcpu-ubuntu-2204
- os: macos-15
arch: arm64
runs-on: macos-13-xlarge
runs-on: macos-15

runs-on: ${{ matrix.runs-on }}

steps:

- name: Checkout repository
uses: actions/checkout@v4

Expand All @@ -42,10 +55,10 @@ jobs:
include:
- os: ubuntu-22.04
arch: x86_64
runs-on: buildjet-8vcpu-ubuntu-2204
- os: macos-13-latest
runs-on: buildjet-16vcpu-ubuntu-2204
- os: macos-15
arch: arm64
runs-on: macos-13-xlarge
runs-on: macos-15

runs-on: ${{ matrix.runs-on }}

Expand Down Expand Up @@ -183,7 +196,7 @@ jobs:
include:
- os: ubuntu-22.04
arch: x86_64
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: buildjet-16vcpu-ubuntu-2204

runs-on: ${{ matrix.runs-on }}

Expand Down Expand Up @@ -239,7 +252,7 @@ jobs:
include:
- os: ubuntu-22.04
arch: x86_64
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: buildjet-16vcpu-ubuntu-2204

runs-on: ${{ matrix.runs-on }}

Expand Down Expand Up @@ -317,7 +330,7 @@ jobs:
include:
- os: ubuntu-22.04
arch: x86_64
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: buildjet-16vcpu-ubuntu-2204

runs-on: ${{ matrix.runs-on }}

Expand Down Expand Up @@ -372,7 +385,7 @@ jobs:
include:
- os: ubuntu-22.04
arch: x86_64
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: buildjet-16vcpu-ubuntu-2204

runs-on: ${{ matrix.runs-on }}

Expand Down Expand Up @@ -444,7 +457,7 @@ jobs:
# include:
# - os: ubuntu-22.04
# arch: x86_64
# runs-on: buildjet-8vcpu-ubuntu-2204
# runs-on: buildjet-16vcpu-ubuntu-2204
#
# runs-on: ${{ matrix.runs-on }}
#
Expand Down
78 changes: 0 additions & 78 deletions .github/workflows/hsm-demo-containers.yml

This file was deleted.

Loading