Skip to content

Commit

Permalink
Merge branch 'mirroring-marko-update-workflow-names' into 'master'
Browse files Browse the repository at this point in the history
Syncing marko-update-workflow-names from GitHub

Renaming workflow files to have them logically grouped together. Removing '-' from job names to make it visually better. Renaming some jobs to make them intuitively more understandable. 

See merge request dfinity-lab/public/ic!19123
  • Loading branch information
marko-k0 committed May 6, 2024
2 parents 01df3d2 + 608504e commit 776df1e
Show file tree
Hide file tree
Showing 13 changed files with 68 additions and 64 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Main CI
name: CI Main

on:
merge_group:
Expand Down Expand Up @@ -88,7 +88,7 @@ anchors:
jobs:
bazel-test-all:
name: Bazel-Test-All
name: Bazel Test All
<<: *bazel-large-setup
outputs:
artifacts_produced: ${{ steps.bazel-test-all.outputs.upload_artifacts }}
Expand Down Expand Up @@ -125,8 +125,8 @@ jobs:
path: |
bazel-targets
bazel-test-all-rebuild:
name: Bazel-Test-All-Rebuild
bazel-build-all-no-cache:
name: Bazel Build All No Cache
<<: *bazel-large-setup
steps:
- <<: *checkout
Expand All @@ -139,7 +139,7 @@ jobs:
uses: actions/checkout@v3
if : ${{ github.event_name != 'pull_request' }}
- <<: *docker-ro-login
- name: Run Bazel Test All Rebuild
- name: Run Bazel Build All No Cache
id: bazel-test-all-rebuild
uses: ./.github/actions/bazel-test-all/
with:
Expand All @@ -148,9 +148,9 @@ jobs:
BAZEL_EXTRA_ARGS: "--repository_cache= --disk_cache= --noremote_accept_cached --remote_instance_name=${CI_COMMIT_SHA} --@rules_rust//rust/settings:pipelined_compilation=True"
- <<: *after-script

bazel-config-check-all-rebuild:
bazel-build-all-config-check:
<<: *bazel-large-setup
name: Bazel-Config-Check-All-Rebuild
name: Bazel Build All Config Check
steps:
- <<: *checkout
uses: actions/checkout@v3 # v4 does not work with bazel-runner-large
Expand All @@ -173,7 +173,7 @@ jobs:
- <<: *after-script

bazel-test-macos:
name: Bazel-Test-MacOS
name: Bazel Test MacOS
timeout-minutes: 90
if: ${{ vars.RUN_CI == 'true' && github.event_name != 'pull_request' && github.event_name != 'merge_group' }} # disable until we have more macos runners
runs-on:
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:
sudo rm -rf /var/tmp/bazel-output//${ROOT_PIPELINE_ID}
bazel-build-fuzzers:
name: Bazel-Build-Fuzzers
name: Bazel Build Fuzzers
<<: *bazel-small-setup
steps:
- <<: *checkout
Expand All @@ -228,7 +228,7 @@ jobs:
- <<: *after-script

bazel-build-fuzzers-afl:
name: Bazel-Build-Fuzzers-AFL
name: Bazel Build Fuzzers AFL
<<: *bazel-small-setup
steps:
- <<: *checkout
Expand All @@ -243,7 +243,7 @@ jobs:
- <<: *after-script

python-ci-tests:
name: Python-CI-Tests
name: Python CI Tests
runs-on: ubuntu-latest
timeout-minutes: 30
if: ${{ vars.RUN_CI == 'true' }}
Expand All @@ -257,10 +257,12 @@ jobs:
export PYTHONPATH=$PWD/gitlab-ci/src:$PWD/gitlab-ci/src/dependencies
pip3 install --ignore-installed -r requirements.txt
cd gitlab-ci/src
pytest --ignore=gitlab_config/ --ignore=git_changes/ -v -o junit_family=xunit1 --junitxml=../../test_report.xml --cov=. --cov-report=term --cov-report=term-missing --cov-report=html --cov-branch
pytest --ignore=gitlab_config/ --ignore=git_changes/ -v -o junit_family=xunit1 \
--junitxml=../../test_report.xml --cov=. --cov-report=term \
--cov-report=term-missing --cov-report=html --cov-branch
build-ic:
name: Build-IC
name: Build IC
<<: *bazel-large-setup
outputs:
artifacts_produced: ${{ steps.build-ic.outputs.upload_artifacts }}
Expand Down Expand Up @@ -351,7 +353,7 @@ jobs:
SETUPOS_FLAG: ${{ matrix.SETUPOS_FLAG }}

cargo-clippy-linux:
name: Cargo-Clippy-Linux
name: Cargo Clippy Linux
<<: *bazel-small-setup
steps:
- <<: *checkout
Expand All @@ -369,7 +371,7 @@ jobs:
run: echo "No cargo changes, skipping run"

cargo-build-release-linux:
name: Cargo-Build-Release-Linux
name: Cargo Build Release Linux
<<: *bazel-small-setup
timeout-minutes: 60
steps:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: PR Only
name: CI PR Only
# Jobs that run on PRs, but no other pipelines

on:
Expand All @@ -13,7 +13,7 @@ concurrency:
env:
CI_MERGE_REQUEST_TITLE: ${{ github.event.pull_request.title }}
ORG: ${{ vars.ORG }}

anchors:
image: &image
image: dfinity/ic-build:96177205e9f7896a8b5501abfb1cc6fc5f584f2b5cf99f06ba922e05597ad7d9
Expand All @@ -37,7 +37,7 @@ anchors:

jobs:
bazel-build-fuzzers-archives:
name: Bazel-Build-Fuzzers-Archives
name: Bazel Build Fuzzers Archives
<<: *bazel-small-setup
timeout-minutes: 60
steps:
Expand All @@ -63,7 +63,7 @@ jobs:
run: echo "No changes in fuzzers, skipping build"

lock-generate:
name: Lock-Generate
name: Lock Generate
<<: *bazel-small-setup
steps:
- <<: *checkout
Expand All @@ -89,7 +89,7 @@ jobs:
run: echo "No changes in lock-generate, skipping run"

commit-lint:
name: Commit-Lint
name: Commit Lint
<<: *default-setup
steps:
- <<: *checkout
Expand All @@ -98,7 +98,7 @@ jobs:
run: ./gitlab-ci/src/ci-scripts/commit-lint.sh

pre-commit:
name: Pre-Commit
name: Pre Commit Test
<<: *bazel-small-setup
steps:
- <<: *checkout
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Hourly CI
name: Schedule Hourly

on:
schedule:
Expand Down Expand Up @@ -36,7 +36,7 @@ anchors:

jobs:
bazel-system-test-hourly:
name: Bazel-System-Test-Hourly
name: Bazel System Tests Hourly
<<: *bazel-large-setup
if: ${{ vars.RUN_CI == 'true' }}
steps:
Expand All @@ -55,10 +55,8 @@ jobs:
bazel clean
bazel-test-coverage:
name: Bazel Test Coverage
<<: *bazel-large-setup
name: Bazel-Test-Coverage
permissions:
contents: write
if: ${{ vars.RUN_CI == 'true' }}
steps:
- <<: *checkout
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Workflow for building IC Base Container Images
# On master branch the images are pushe to DockerHub and references updated in automated PR
# On master branch the images are pushed to DockerHub and references updated in automated PR

name: IC Base Images
name: IC Base Container Images

on:
# TODO: Enable prior to migration
# schedule:
# - cron: "0 8 * * 4"
workflow_dispatch:
# TODO: Change to pull_request_target
pull_request:
paths:
- '.github/workflows/base-images.yml'
- '**/Dockerfile.base'
- '**/packages.common'
- '**/packages.dev'
Expand All @@ -25,7 +25,7 @@ permissions:

jobs:
build-base-image:
name: Build Base Image
name: Build Base Container Image
runs-on: ubuntu-latest
timeout-minutes: 45
if: ${{ vars.RUN_CI == 'true' }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
name: Generate-CI
name: CI Generate CI

on:
pull_request:
paths:
- '.github/**'
- '.github/workflows-source/*.yml'

env:
CI_PROJECT_DIR: ${{ github.workspace }}

jobs:
generate-ci:
name: Generate CI
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -18,7 +19,7 @@ jobs:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}
token: ${{ secrets.PUSH_TO_PR }}
- name: Generate CI
- name: Run Generate CI
id: generate-ci
run: |
python $CI_PROJECT_DIR/.github/scripts/generate-ci.py
Expand Down
32 changes: 17 additions & 15 deletions .github/workflows/main-ci.yml → .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Main CI
name: CI Main
on:
merge_group:
# Allows you to run this workflow manually from the Actions tab
Expand Down Expand Up @@ -30,7 +30,7 @@ env:
DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
jobs:
bazel-test-all:
name: Bazel-Test-All
name: Bazel Test All
runs-on:
labels: bazel-runner-large
container:
Expand Down Expand Up @@ -83,8 +83,8 @@ jobs:
if-no-files-found: error
path: |
bazel-targets
bazel-test-all-rebuild:
name: Bazel-Test-All-Rebuild
bazel-build-all-no-cache:
name: Bazel Build All No Cache
runs-on:
labels: bazel-runner-large
container:
Expand All @@ -109,7 +109,7 @@ jobs:
if which docker-bin 2>/dev/null; then
docker-bin login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_PASSWORD_RO"
fi
- name: Run Bazel Test All Rebuild
- name: Run Bazel Build All No Cache
id: bazel-test-all-rebuild
uses: ./.github/actions/bazel-test-all/
with:
Expand All @@ -122,14 +122,14 @@ jobs:
run: |
bazel clean
# rm -rf "${CI_PROJECT_DIR}/" # this doesn't work, TODO: figure out if and where data gets stored
bazel-config-check-all-rebuild:
bazel-build-all-config-check:
runs-on:
labels: bazel-runner-large
container:
image: dfinity/ic-build:96177205e9f7896a8b5501abfb1cc6fc5f584f2b5cf99f06ba922e05597ad7d9
timeout-minutes: 90
if: ${{ vars.RUN_CI == 'true' }} # needed to avoid running on public dfinity org until published
name: Bazel-Config-Check-All-Rebuild
name: Bazel Build All Config Check
steps:
- name: Checkout
uses: actions/checkout@v3 # v4 does not work with bazel-runner-large
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
bazel clean
# rm -rf "${CI_PROJECT_DIR}/" # this doesn't work, TODO: figure out if and where data gets stored
bazel-test-macos:
name: Bazel-Test-MacOS
name: Bazel Test MacOS
timeout-minutes: 90
if: ${{ vars.RUN_CI == 'true' && github.event_name != 'pull_request' && github.event_name != 'merge_group' }} # disable until we have more macos runners
runs-on:
Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
run: |
sudo rm -rf /var/tmp/bazel-output//${ROOT_PIPELINE_ID}
bazel-build-fuzzers:
name: Bazel-Build-Fuzzers
name: Bazel Build Fuzzers
runs-on:
labels: bazel-runner-small
container:
Expand All @@ -237,7 +237,7 @@ jobs:
bazel clean
# rm -rf "${CI_PROJECT_DIR}/" # this doesn't work, TODO: figure out if and where data gets stored
bazel-build-fuzzers-afl:
name: Bazel-Build-Fuzzers-AFL
name: Bazel Build Fuzzers AFL
runs-on:
labels: bazel-runner-small
container:
Expand All @@ -262,7 +262,7 @@ jobs:
bazel clean
# rm -rf "${CI_PROJECT_DIR}/" # this doesn't work, TODO: figure out if and where data gets stored
python-ci-tests:
name: Python-CI-Tests
name: Python CI Tests
runs-on: ubuntu-latest
timeout-minutes: 30
if: ${{ vars.RUN_CI == 'true' }}
Expand All @@ -277,9 +277,11 @@ jobs:
export PYTHONPATH=$PWD/gitlab-ci/src:$PWD/gitlab-ci/src/dependencies
pip3 install --ignore-installed -r requirements.txt
cd gitlab-ci/src
pytest --ignore=gitlab_config/ --ignore=git_changes/ -v -o junit_family=xunit1 --junitxml=../../test_report.xml --cov=. --cov-report=term --cov-report=term-missing --cov-report=html --cov-branch
pytest --ignore=gitlab_config/ --ignore=git_changes/ -v -o junit_family=xunit1 \
--junitxml=../../test_report.xml --cov=. --cov-report=term \
--cov-report=term-missing --cov-report=html --cov-branch
build-ic:
name: Build-IC
name: Build IC
runs-on:
labels: bazel-runner-large
container:
Expand Down Expand Up @@ -385,7 +387,7 @@ jobs:
PATH1: ${{ matrix.PATH1 }}
SETUPOS_FLAG: ${{ matrix.SETUPOS_FLAG }}
cargo-clippy-linux:
name: Cargo-Clippy-Linux
name: Cargo Clippy Linux
runs-on:
labels: bazel-runner-small
container:
Expand Down Expand Up @@ -415,7 +417,7 @@ jobs:
if: steps.filter.outputs.cargo == 'false'
run: echo "No cargo changes, skipping run"
cargo-build-release-linux:
name: Cargo-Build-Release-Linux
name: Cargo Build Release Linux
runs-on:
labels: bazel-runner-small
container:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Notify Slack New PR
name: PR Slack Notification

on:
pull_request:
Expand Down
Loading

0 comments on commit 776df1e

Please sign in to comment.