Skip to content

Commit cc6c312

Browse files
authored
fix: add back labeled builds (#1072)
1 parent 88d12fb commit cc6c312

File tree

3 files changed

+45
-95
lines changed

3 files changed

+45
-95
lines changed

.github/workflows/build-push-containers-all.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,25 @@ on:
88
- opened
99
- synchronize
1010
push:
11-
branches:
12-
- '**'
1311
tags:
1412
- '[0-9]*.[0-9]*.[0-9]*'
1513

1614
jobs:
15+
16+
read-github-context-object:
17+
runs-on: ubuntu-latest
18+
steps:
19+
# I know this is not pretty (debug information) but it's useful to have this
20+
- name: Read github context
21+
env:
22+
GITHUB_CONTEXT: ${{ toJson(github) }}
23+
run: |
24+
echo "GITHUB_SHA=${GITHUB_SHA}"
25+
echo "INFO: github context object content below"
26+
echo "${GITHUB_CONTEXT}"
27+
1728
build-push-checked-containers:
29+
if: contains(github.event.pull_request.labels.*.name, 'cicd:movement-containers') || github.ref == 'refs/heads/main' || github.event.label.name == 'cicd:movement-containers'
1830
uses: ./.github/workflows/build-push-container.yml
1931
name: Build Push Checked Containers
2032
secrets: inherit
@@ -36,6 +48,7 @@ jobs:
3648
container_name: ${{ matrix.container_name }}
3749

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

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

112125
build-push-unchecked-containers:
126+
if: contains(github.event.pull_request.labels.*.name, 'cicd:bridge-containers') || github.ref == 'refs/heads/main' || github.event.label.name == 'cicd:bridge-containers'
127+
113128
uses: ./.github/workflows/build-push-container.yml
114129
name: Build Push Unchecked Containers
115130
secrets: inherit

.github/workflows/checks-all.yml

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,38 @@ on:
77
- opened
88
- synchronize
99
push:
10-
branches:
11-
- '**'
10+
tags:
11+
- '[0-9]*.[0-9]*.[0-9]*'
1212

1313
jobs:
14-
14+
15+
read-github-context-object:
16+
runs-on: ubuntu-latest
17+
steps:
18+
# I know this is not pretty (debug information) but it's useful to have this
19+
- name: Read github context
20+
env:
21+
GITHUB_CONTEXT: ${{ toJson(github) }}
22+
run: |
23+
echo "GITHUB_SHA=${GITHUB_SHA}"
24+
echo "INFO: github context object content below"
25+
echo "${GITHUB_CONTEXT}"
26+
1527
build:
1628
strategy:
1729
matrix:
1830
include:
1931
- os: ubuntu-22.04
2032
arch: x86_64
21-
runs-on: buildjet-8vcpu-ubuntu-2204
22-
- os: macos-13-latest
33+
runs-on: buildjet-16vcpu-ubuntu-2204
34+
- os: macos-15
2335
arch: arm64
24-
runs-on: macos-13-xlarge
36+
runs-on: macos-15
2537

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

2840
steps:
41+
2942
- name: Checkout repository
3043
uses: actions/checkout@v4
3144

@@ -42,10 +55,10 @@ jobs:
4255
include:
4356
- os: ubuntu-22.04
4457
arch: x86_64
45-
runs-on: buildjet-8vcpu-ubuntu-2204
46-
- os: macos-13-latest
58+
runs-on: buildjet-16vcpu-ubuntu-2204
59+
- os: macos-15
4760
arch: arm64
48-
runs-on: macos-13-xlarge
61+
runs-on: macos-15
4962

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

@@ -183,7 +196,7 @@ jobs:
183196
include:
184197
- os: ubuntu-22.04
185198
arch: x86_64
186-
runs-on: buildjet-8vcpu-ubuntu-2204
199+
runs-on: buildjet-16vcpu-ubuntu-2204
187200

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

@@ -239,7 +252,7 @@ jobs:
239252
include:
240253
- os: ubuntu-22.04
241254
arch: x86_64
242-
runs-on: buildjet-8vcpu-ubuntu-2204
255+
runs-on: buildjet-16vcpu-ubuntu-2204
243256

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

@@ -317,7 +330,7 @@ jobs:
317330
include:
318331
- os: ubuntu-22.04
319332
arch: x86_64
320-
runs-on: buildjet-8vcpu-ubuntu-2204
333+
runs-on: buildjet-16vcpu-ubuntu-2204
321334

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

@@ -372,7 +385,7 @@ jobs:
372385
include:
373386
- os: ubuntu-22.04
374387
arch: x86_64
375-
runs-on: buildjet-8vcpu-ubuntu-2204
388+
runs-on: buildjet-16vcpu-ubuntu-2204
376389

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

@@ -444,7 +457,7 @@ jobs:
444457
# include:
445458
# - os: ubuntu-22.04
446459
# arch: x86_64
447-
# runs-on: buildjet-8vcpu-ubuntu-2204
460+
# runs-on: buildjet-16vcpu-ubuntu-2204
448461
#
449462
# runs-on: ${{ matrix.runs-on }}
450463
#

.github/workflows/hsm-demo-containers.yml

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)