Skip to content

Commit

Permalink
Merge branch 'mirroring-allow-manual-trigger-for-container-autobuild'…
Browse files Browse the repository at this point in the history
… into 'master'

chore(github-sync): PR#275 / chore(IDX): allow manual trigger for container autobuild

[GitHub PR 275](#275) (branch: allow-manual-trigger-for-container-autobuild) 

See merge request dfinity-lab/public/ic!20104
  • Loading branch information
marko-k0 committed Jun 27, 2024
2 parents 023e03c + 39fac56 commit afb1c89
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .github/workflows-source/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ env:

anchors:
image: &image
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
dind-large-setup: &dind-large-setup
runs-on:
group: dind-large
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows-source/ci-pr-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env:

anchors:
image: &image
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
dind-small-setup: &dind-small-setup
runs-on:
group: dind-small
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows-source/release-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
- 'hotfix-*-rc--*'
- 'rc--*'
workflow_dispatch:
pull_request:
paths:
- '.github/workflows/release-testing.yml'

env:
CI_COMMIT_SHA: ${{ github.sha }}
Expand All @@ -30,7 +27,7 @@ env:

anchors:
image: &image
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
dind-large-setup: &dind-large-setup
runs-on:
group: dind-large
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows-source/schedule-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:

anchors:
image: &image
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
dind-large-setup: &dind-large-setup
runs-on:
group: dind-large
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows-source/schedule-hourly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
schedule:
- cron: "0 * * * *"
workflow_dispatch:
pull_request:
paths:
- '.github/workflows/schedule-hourly.yml'

env:
CI_COMMIT_SHA: ${{ github.sha }}
Expand All @@ -28,7 +25,7 @@ env:

anchors:
image: &image
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
dind-large-setup: &dind-large-setup
runs-on:
group: dind-large
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 90
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 90
if: ${{ vars.RUN_CI == 'true' }}
name: Bazel Build All Config Check
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 90
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand All @@ -189,7 +189,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 90
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 90
if: ${{ vars.RUN_CI == 'true' && github.event_name != 'merge_group' }}
steps:
Expand Down Expand Up @@ -331,7 +331,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 90
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand Down Expand Up @@ -367,7 +367,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 90
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-pr-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 90
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
runs-on:
group: dind-small
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 30
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
runs-on:
group: dind-small
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 30
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/container-autobuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- '.bazelversion'
- 'rust-toolchain.toml'
- 'gitlab-ci/container/**'
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/release-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ on:
- 'hotfix-*-rc--*'
- 'rc--*'
workflow_dispatch:
pull_request:
paths:
- '.github/workflows/release-testing.yml'
env:
CI_COMMIT_SHA: ${{ github.sha }}
CI_COMMIT_REF_PROTECTED: ${{ github.ref_protected }}
Expand All @@ -31,7 +28,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 180 # 3 hours
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand All @@ -56,7 +53,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 180 # 3 hours
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand All @@ -80,7 +77,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
if: ${{ vars.RUN_CI == 'true' }}
timeout-minutes: 90
steps:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/schedule-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 720 # 12 hours
# TODO: disable in GitLab before enabling here
if: ${{ vars.RUN_CI == 'true' && false }}
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 120
# TODO: enable when zh1 is active again
if: ${{ vars.RUN_CI == 'true' && false }}
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 20
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand All @@ -137,7 +137,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 480
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/schedule-hourly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ on:
schedule:
- cron: "0 * * * *"
workflow_dispatch:
pull_request:
paths:
- '.github/workflows/schedule-hourly.yml'
env:
CI_COMMIT_SHA: ${{ github.sha }}
CI_COMMIT_REF_PROTECTED: ${{ github.ref_protected }}
Expand All @@ -29,7 +26,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 120
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand All @@ -50,7 +47,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 120
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand All @@ -74,7 +71,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 120
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/schedule-weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
schedule:
- cron: "0 8 * * 3"
workflow_dispatch:
pull_request:
paths:
- '.github/workflows/schedule-weekly.yml'

env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
Expand All @@ -17,7 +14,7 @@ jobs:
runs-on:
group: dind-large
container:
image: ghcr.io/dfinity/ic-build@sha256:5bd0f059ad6e21966e9c644516b6ecd52d5ed44f1b18a76b91b59740a9d639a2
image: ghcr.io/dfinity/ic-build@sha256:b7d870287df55b9972ed285fe1a9792cb81243523400d83d491f3ee149e8d47c
timeout-minutes: 60 # 1 hour
if: ${{ vars.RUN_CI == 'true' }} # needed to avoid running on public dfinity org until published
steps:
Expand Down
2 changes: 1 addition & 1 deletion gitlab-ci/container/TAG_GH
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f9d8505c07589b765e3897eafb7b48902ee7e2bb088fc8ac329544081bede1bf
24bbf7e3a37a1de06f55b44b3419a92a929f919ba8e1dacb540255a17de36ad7

0 comments on commit afb1c89

Please sign in to comment.