From eb3b2db59104f1dc0793f6a1222c82dff420ad12 Mon Sep 17 00:00:00 2001 From: Carly Gundy Date: Thu, 26 Sep 2024 15:36:21 +0200 Subject: [PATCH 01/16] refactor(IDX): remove CI_JOB_ID var --- .github/workflows-source/ci-main.yml | 15 +++++++-------- .github/workflows-source/release-testing.yml | 1 - .github/workflows-source/schedule-daily.yml | 1 - .github/workflows-source/schedule-hourly.yml | 1 - .github/workflows/ci-main.yml | 15 +++++++-------- .github/workflows/release-testing.yml | 1 - .github/workflows/schedule-daily.yml | 1 - .github/workflows/schedule-hourly.yml | 1 - .github/workflows/schedule-rust-bench.yml | 1 - .github/workflows/system-tests-k8s.yml | 1 - bazel/workspace_status.sh | 1 - ci/bazel-scripts/main.sh | 2 +- ci/scripts/run-build-ic.sh | 4 ++-- 13 files changed, 17 insertions(+), 28 deletions(-) diff --git a/.github/workflows-source/ci-main.yml b/.github/workflows-source/ci-main.yml index ee45e737c02..513e86fd40d 100644 --- a/.github/workflows-source/ci-main.yml +++ b/.github/workflows-source/ci-main.yml @@ -22,7 +22,6 @@ permissions: read-all env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.job }} # github does not expose this variable https://github.com/orgs/community/discussions/8945 CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} @@ -251,12 +250,12 @@ jobs: run: | set -eExuo pipefail REPO_NAME="${GITHUB_REPOSITORY##*/}" - rm -rf "/cache/job/${CI_JOB_ID}/${ROOT_PIPELINE_ID}" - mkdir -p "/cache/job/${CI_JOB_ID}/${ROOT_PIPELINE_ID}/artifacts" - ln -s "/cache/job/${CI_JOB_ID}/${ROOT_PIPELINE_ID}/artifacts" /__w/$REPO_NAME/$REPO_NAME/artifacts - buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_ID" build-command -- \ + rm -rf "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}" + mkdir -p "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}/artifacts" + ln -s "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}/artifacts" /__w/$REPO_NAME/$REPO_NAME/artifacts + buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_NAME" build-command -- \ "$CI_PROJECT_DIR"/ci/scripts/run-build-ic.sh - rm -rf "/cache/job/${CI_JOB_ID}/${ROOT_PIPELINE_ID}" + rm -rf "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}" env: BAZEL_COMMAND: "build" RUN_ON_DIFF_ONLY: ${{ !contains(github.event.pull_request.labels.*.name, 'CI_ALL_BAZEL_TARGETS') }} @@ -346,7 +345,7 @@ jobs: shell: bash run: | set -eExuo pipefail - buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_ID" build-command -- \ + buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_NAME" build-command -- \ "$CI_PROJECT_DIR"/ci/scripts/rust-lint.sh cargo-build-release-linux: @@ -375,5 +374,5 @@ jobs: shell: bash run: | set -eExuo pipefail - buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_ID" build-command -- \ + buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_NAME" build-command -- \ cargo build --release diff --git a/.github/workflows-source/release-testing.yml b/.github/workflows-source/release-testing.yml index 52ab5ce25e5..3368b085fec 100644 --- a/.github/workflows-source/release-testing.yml +++ b/.github/workflows-source/release-testing.yml @@ -15,7 +15,6 @@ concurrency: env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.job }} # github does not expose this variable https://github.com/orgs/community/discussions/8945 CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/.github/workflows-source/schedule-daily.yml b/.github/workflows-source/schedule-daily.yml index 099422e2c5c..7a923c7238d 100644 --- a/.github/workflows-source/schedule-daily.yml +++ b/.github/workflows-source/schedule-daily.yml @@ -10,7 +10,6 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.job }} # github does not expose this variable https://github.com/orgs/community/discussions/8945 CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/.github/workflows-source/schedule-hourly.yml b/.github/workflows-source/schedule-hourly.yml index c932239b9c3..85f03bacf73 100644 --- a/.github/workflows-source/schedule-hourly.yml +++ b/.github/workflows-source/schedule-hourly.yml @@ -9,7 +9,6 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.job }} # github does not expose this variable https://github.com/orgs/community/discussions/8945 CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 04c616e49b9..a21b44393af 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -18,7 +18,6 @@ permissions: read-all env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.job }} # github does not expose this variable https://github.com/orgs/community/discussions/8945 CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} @@ -337,12 +336,12 @@ jobs: run: | set -eExuo pipefail REPO_NAME="${GITHUB_REPOSITORY##*/}" - rm -rf "/cache/job/${CI_JOB_ID}/${ROOT_PIPELINE_ID}" - mkdir -p "/cache/job/${CI_JOB_ID}/${ROOT_PIPELINE_ID}/artifacts" - ln -s "/cache/job/${CI_JOB_ID}/${ROOT_PIPELINE_ID}/artifacts" /__w/$REPO_NAME/$REPO_NAME/artifacts - buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_ID" build-command -- \ + rm -rf "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}" + mkdir -p "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}/artifacts" + ln -s "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}/artifacts" /__w/$REPO_NAME/$REPO_NAME/artifacts + buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_NAME" build-command -- \ "$CI_PROJECT_DIR"/ci/scripts/run-build-ic.sh - rm -rf "/cache/job/${CI_JOB_ID}/${ROOT_PIPELINE_ID}" + rm -rf "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}" env: BAZEL_COMMAND: "build" RUN_ON_DIFF_ONLY: ${{ !contains(github.event.pull_request.labels.*.name, 'CI_ALL_BAZEL_TARGETS') }} @@ -442,7 +441,7 @@ jobs: shell: bash run: | set -eExuo pipefail - buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_ID" build-command -- \ + buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_NAME" build-command -- \ "$CI_PROJECT_DIR"/ci/scripts/rust-lint.sh cargo-build-release-linux: name: Cargo Build Release Linux @@ -479,5 +478,5 @@ jobs: shell: bash run: | set -eExuo pipefail - buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_ID" build-command -- \ + buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_NAME" build-command -- \ cargo build --release diff --git a/.github/workflows/release-testing.yml b/.github/workflows/release-testing.yml index 46498010d40..6af4271bc4b 100644 --- a/.github/workflows/release-testing.yml +++ b/.github/workflows/release-testing.yml @@ -12,7 +12,6 @@ concurrency: env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.job }} # github does not expose this variable https://github.com/orgs/community/discussions/8945 CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/.github/workflows/schedule-daily.yml b/.github/workflows/schedule-daily.yml index 1a344422586..cc407904ec3 100644 --- a/.github/workflows/schedule-daily.yml +++ b/.github/workflows/schedule-daily.yml @@ -8,7 +8,6 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.job }} # github does not expose this variable https://github.com/orgs/community/discussions/8945 CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/.github/workflows/schedule-hourly.yml b/.github/workflows/schedule-hourly.yml index 65af24bcef6..f435db41c43 100644 --- a/.github/workflows/schedule-hourly.yml +++ b/.github/workflows/schedule-hourly.yml @@ -7,7 +7,6 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.job }} # github does not expose this variable https://github.com/orgs/community/discussions/8945 CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/.github/workflows/schedule-rust-bench.yml b/.github/workflows/schedule-rust-bench.yml index 8d961b21c6c..a0789d10a37 100644 --- a/.github/workflows/schedule-rust-bench.yml +++ b/.github/workflows/schedule-rust-bench.yml @@ -10,7 +10,6 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.job }} # github does not expose this variable https://github.com/orgs/community/discussions/8945 CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/.github/workflows/system-tests-k8s.yml b/.github/workflows/system-tests-k8s.yml index 76f54391acb..5de22a16559 100644 --- a/.github/workflows/system-tests-k8s.yml +++ b/.github/workflows/system-tests-k8s.yml @@ -35,7 +35,6 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.job }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/bazel/workspace_status.sh b/bazel/workspace_status.sh index 0d9305b8a6f..484dc2a6ddf 100755 --- a/bazel/workspace_status.sh +++ b/bazel/workspace_status.sh @@ -23,7 +23,6 @@ echo "STABLE_WORKSPACE_ROOT ${WORKSPACE_ROOT}" echo "HOME ${HOME}" -test -n "${CI_JOB_ID:-}" && echo "CI_JOB_ID ${CI_JOB_ID}" test -n "${CI_JOB_NAME:-}" && echo "CI_JOB_NAME ${CI_JOB_NAME}" test -n "${CI_RUNNER_TAGS:-}" && echo "CI_RUNNER_TAGS ${CI_RUNNER_TAGS}" diff --git a/ci/bazel-scripts/main.sh b/ci/bazel-scripts/main.sh index 9dc644bde56..5d3d5ba9f72 100755 --- a/ci/bazel-scripts/main.sh +++ b/ci/bazel-scripts/main.sh @@ -87,7 +87,7 @@ stream_awk_program=' # shellcheck disable=SC2086 # ${BAZEL_...} variables are expected to contain several arguments. We have `set -f` set above to disable globbing (and therefore only allow splitting)" -buildevents cmd "${ROOT_PIPELINE_ID}" "${CI_JOB_ID}" "${CI_JOB_NAME}-bazel-cmd" -- bazel \ +buildevents cmd "${ROOT_PIPELINE_ID}" "${CI_JOB_NAME}" "${CI_JOB_NAME}-bazel-cmd" -- bazel \ ${BAZEL_STARTUP_ARGS} \ ${BAZEL_COMMAND} \ --color=yes \ diff --git a/ci/scripts/run-build-ic.sh b/ci/scripts/run-build-ic.sh index 77614d77cc4..e90dc207147 100755 --- a/ci/scripts/run-build-ic.sh +++ b/ci/scripts/run-build-ic.sh @@ -58,7 +58,7 @@ fi tar -chf artifacts.tar artifacts ls -l /ceph-s3-info/** || true -URL="http://$(cat /ceph-s3-info/BUCKET_HOST)/$(cat /ceph-s3-info/BUCKET_NAME)/${VERSION}/${CI_JOB_ID}" +URL="http://$(cat /ceph-s3-info/BUCKET_HOST)/$(cat /ceph-s3-info/BUCKET_NAME)/${VERSION}/${CI_JOB_NAME}" curl --request PUT --upload-file artifacts.tar "${URL}/artifacts.tar" mkdir build-ic @@ -69,7 +69,7 @@ for DIR in release canisters icos/guestos icos/hostos icos/setupos; do fi done -EXTERNAL_URL="https://objects.$(echo "${NODE_NAME:-}" | cut -d'-' -f1)-idx1.dfinity.network/$(cat /ceph-s3-info/BUCKET_NAME)/${VERSION}/${CI_JOB_ID}/artifacts.tar" +EXTERNAL_URL="https://objects.$(echo "${NODE_NAME:-}" | cut -d'-' -f1)-idx1.dfinity.network/$(cat /ceph-s3-info/BUCKET_NAME)/${VERSION}/${CI_JOB_NAME}/artifacts.tar" echo -e "Node: ${NODE_NAME:-}\nURL: ${URL}\nExternal URL: ${EXTERNAL_URL}" >./build-ic/info echo "${EXTERNAL_URL}" >./build-ic/url tar -cf build-ic.tar build-ic From c17dd07c8f28a98a12fc30e017a3c390138744f8 Mon Sep 17 00:00:00 2001 From: Carly Gundy Date: Thu, 26 Sep 2024 21:01:07 +0200 Subject: [PATCH 02/16] replace references --- .github/workflows-source/ci-main.yml | 18 +++++++++--------- .github/workflows-source/release-testing.yml | 2 +- .github/workflows-source/schedule-daily.yml | 2 +- .github/workflows-source/schedule-hourly.yml | 2 +- .github/workflows/schedule-hourly.yml | 2 +- .github/workflows/schedule-rust-bench.yml | 2 +- .github/workflows/system-tests-k8s.yml | 2 +- ci/bazel-scripts/main.sh | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows-source/ci-main.yml b/.github/workflows-source/ci-main.yml index 513e86fd40d..8ea4fa0c22c 100644 --- a/.github/workflows-source/ci-main.yml +++ b/.github/workflows-source/ci-main.yml @@ -22,12 +22,12 @@ permissions: read-all env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} + CI_JOB_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} CI_PULL_REQUEST_TARGET_BRANCH_NAME: ${{ github.event.pull_request.base.ref }} BRANCH_NAME: ${{ github.head_ref || github.ref_name }} - ROOT_PIPELINE_ID: ${{ github.run_id }} RUSTFLAGS: "--remap-path-prefix=${CI_PROJECT_DIR}=/ic" BUILDEVENT_DATASET: "github-ci-dfinity" @@ -175,7 +175,7 @@ jobs: BAZEL_CI_CONFIG: "--config=ci --config macos_ci" BAZEL_COMMAND: test BAZEL_EXTRA_ARGS: '--test_tag_filters=test_macos' - BAZEL_STARTUP_ARGS: "--output_base /var/tmp/bazel-output/${ROOT_PIPELINE_ID}" + BAZEL_STARTUP_ARGS: "--output_base /var/tmp/bazel-output/${CI_JOB_ID}" BAZEL_TARGETS: "//rs/... //publish/binaries/..." HONEYCOMB_API_TOKEN: ${{ secrets.HONEYCOMB_API_TOKEN }} - <<: *bazel-bep @@ -250,12 +250,12 @@ jobs: run: | set -eExuo pipefail REPO_NAME="${GITHUB_REPOSITORY##*/}" - rm -rf "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}" - mkdir -p "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}/artifacts" - ln -s "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}/artifacts" /__w/$REPO_NAME/$REPO_NAME/artifacts - buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_NAME" build-command -- \ + rm -rf "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}" + mkdir -p "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}/artifacts" + ln -s "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}/artifacts" /__w/$REPO_NAME/$REPO_NAME/artifacts + buildevents cmd "$CI_JOB_ID" "$CI_JOB_NAME" build-command -- \ "$CI_PROJECT_DIR"/ci/scripts/run-build-ic.sh - rm -rf "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}" + rm -rf "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}" env: BAZEL_COMMAND: "build" RUN_ON_DIFF_ONLY: ${{ !contains(github.event.pull_request.labels.*.name, 'CI_ALL_BAZEL_TARGETS') }} @@ -345,7 +345,7 @@ jobs: shell: bash run: | set -eExuo pipefail - buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_NAME" build-command -- \ + buildevents cmd "$CI_JOB_ID" "$CI_JOB_NAME" build-command -- \ "$CI_PROJECT_DIR"/ci/scripts/rust-lint.sh cargo-build-release-linux: @@ -374,5 +374,5 @@ jobs: shell: bash run: | set -eExuo pipefail - buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_NAME" build-command -- \ + buildevents cmd "$CI_JOB_ID" "$CI_JOB_NAME" build-command -- \ cargo build --release diff --git a/.github/workflows-source/release-testing.yml b/.github/workflows-source/release-testing.yml index 3368b085fec..6ffd504c7c7 100644 --- a/.github/workflows-source/release-testing.yml +++ b/.github/workflows-source/release-testing.yml @@ -15,12 +15,12 @@ concurrency: env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} + CI_JOB_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} CI_PULL_REQUEST_TARGET_BRANCH_NAME: ${{ github.event.pull_request.base.ref }} BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.ref_name }} - ROOT_PIPELINE_ID: ${{ github.run_id }} RUSTFLAGS: "--remap-path-prefix=${CI_PROJECT_DIR}=/ic" BUILDEVENT_DATASET: "github-ci-dfinity" diff --git a/.github/workflows-source/schedule-daily.yml b/.github/workflows-source/schedule-daily.yml index 7a923c7238d..3e0bcd58754 100644 --- a/.github/workflows-source/schedule-daily.yml +++ b/.github/workflows-source/schedule-daily.yml @@ -10,11 +10,11 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} + CI_JOB_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} CI_PULL_REQUEST_TARGET_BRANCH_NAME: ${{ github.ref_name }} # this workflow will always run on the default branch - ROOT_PIPELINE_ID: ${{ github.run_id }} BUILDEVENT_DATASET: "github-ci-dfinity" anchors: diff --git a/.github/workflows-source/schedule-hourly.yml b/.github/workflows-source/schedule-hourly.yml index 85f03bacf73..56fbc69eb8f 100644 --- a/.github/workflows-source/schedule-hourly.yml +++ b/.github/workflows-source/schedule-hourly.yml @@ -9,11 +9,11 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} + CI_JOB_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} CI_PULL_REQUEST_TARGET_BRANCH_NAME: ${{ github.event.pull_request.base.ref }} - ROOT_PIPELINE_ID: ${{ github.run_id }} RUSTFLAGS: "--remap-path-prefix=${CI_PROJECT_DIR}=/ic" BUILDEVENT_DATASET: "github-ci-dfinity" diff --git a/.github/workflows/schedule-hourly.yml b/.github/workflows/schedule-hourly.yml index f435db41c43..4759bf89596 100644 --- a/.github/workflows/schedule-hourly.yml +++ b/.github/workflows/schedule-hourly.yml @@ -7,11 +7,11 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} + CI_JOB_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} CI_PULL_REQUEST_TARGET_BRANCH_NAME: ${{ github.event.pull_request.base.ref }} - ROOT_PIPELINE_ID: ${{ github.run_id }} RUSTFLAGS: "--remap-path-prefix=${CI_PROJECT_DIR}=/ic" BUILDEVENT_DATASET: "github-ci-dfinity" jobs: diff --git a/.github/workflows/schedule-rust-bench.yml b/.github/workflows/schedule-rust-bench.yml index a0789d10a37..db31ed4a6e5 100644 --- a/.github/workflows/schedule-rust-bench.yml +++ b/.github/workflows/schedule-rust-bench.yml @@ -10,11 +10,11 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} + CI_JOB_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} CI_PULL_REQUEST_TARGET_BRANCH_NAME: ${{ github.ref_name }} # this workflow will always run on the default branch - ROOT_PIPELINE_ID: ${{ github.run_id }} BUILDEVENT_DATASET: "github-ci-dfinity" jobs: diff --git a/.github/workflows/system-tests-k8s.yml b/.github/workflows/system-tests-k8s.yml index 5de22a16559..f5217e0b94d 100644 --- a/.github/workflows/system-tests-k8s.yml +++ b/.github/workflows/system-tests-k8s.yml @@ -35,10 +35,10 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} + CI_JOB_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} - ROOT_PIPELINE_ID: ${{ github.run_id }} BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_API_TOKEN }} BUILDEVENT_DATASET: "github-ci-dfinity" diff --git a/ci/bazel-scripts/main.sh b/ci/bazel-scripts/main.sh index 5d3d5ba9f72..92d4ef445c9 100755 --- a/ci/bazel-scripts/main.sh +++ b/ci/bazel-scripts/main.sh @@ -87,7 +87,7 @@ stream_awk_program=' # shellcheck disable=SC2086 # ${BAZEL_...} variables are expected to contain several arguments. We have `set -f` set above to disable globbing (and therefore only allow splitting)" -buildevents cmd "${ROOT_PIPELINE_ID}" "${CI_JOB_NAME}" "${CI_JOB_NAME}-bazel-cmd" -- bazel \ +buildevents cmd "${CI_JOB_ID}" "${CI_JOB_NAME}" "${CI_JOB_NAME}-bazel-cmd" -- bazel \ ${BAZEL_STARTUP_ARGS} \ ${BAZEL_COMMAND} \ --color=yes \ From 625bf24ef7979facc1a89c5619112906b9d208cf Mon Sep 17 00:00:00 2001 From: IDX GitHub Automation Date: Thu, 26 Sep 2024 19:05:59 +0000 Subject: [PATCH 03/16] IDX GitHub Automation --- .github/workflows/ci-main.yml | 18 +++++++++--------- .github/workflows/release-testing.yml | 2 +- .github/workflows/schedule-daily.yml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index aec1ae27f57..edc88fc3b15 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -18,11 +18,11 @@ permissions: read-all env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} + CI_JOB_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} BRANCH_NAME: ${{ github.head_ref || github.ref_name }} - ROOT_PIPELINE_ID: ${{ github.run_id }} RUSTFLAGS: "--remap-path-prefix=${CI_PROJECT_DIR}=/ic" BUILDEVENT_DATASET: "github-ci-dfinity" jobs: @@ -173,7 +173,7 @@ jobs: BAZEL_CI_CONFIG: "--config=ci --config macos_ci" BAZEL_COMMAND: test BAZEL_EXTRA_ARGS: '--test_tag_filters=test_macos' - BAZEL_STARTUP_ARGS: "--output_base /var/tmp/bazel-output/${ROOT_PIPELINE_ID}" + BAZEL_STARTUP_ARGS: "--output_base /var/tmp/bazel-output/${CI_JOB_ID}" BAZEL_TARGETS: "//rs/... //publish/binaries/..." HONEYCOMB_API_TOKEN: ${{ secrets.HONEYCOMB_API_TOKEN }} - name: Upload bazel-bep @@ -334,12 +334,12 @@ jobs: run: | set -eExuo pipefail REPO_NAME="${GITHUB_REPOSITORY##*/}" - rm -rf "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}" - mkdir -p "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}/artifacts" - ln -s "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}/artifacts" /__w/$REPO_NAME/$REPO_NAME/artifacts - buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_NAME" build-command -- \ + rm -rf "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}" + mkdir -p "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}/artifacts" + ln -s "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}/artifacts" /__w/$REPO_NAME/$REPO_NAME/artifacts + buildevents cmd "$CI_JOB_ID" "$CI_JOB_NAME" build-command -- \ "$CI_PROJECT_DIR"/ci/scripts/run-build-ic.sh - rm -rf "/cache/job/${CI_JOB_NAME}/${ROOT_PIPELINE_ID}" + rm -rf "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}" env: BAZEL_COMMAND: "build" RUN_ON_DIFF_ONLY: ${{ !contains(github.event.pull_request.labels.*.name, 'CI_ALL_BAZEL_TARGETS') }} @@ -440,7 +440,7 @@ jobs: shell: bash run: | set -eExuo pipefail - buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_NAME" build-command -- \ + buildevents cmd "$CI_JOB_ID" "$CI_JOB_NAME" build-command -- \ "$CI_PROJECT_DIR"/ci/scripts/rust-lint.sh cargo-build-release-linux: name: Cargo Build Release Linux @@ -477,5 +477,5 @@ jobs: shell: bash run: | set -eExuo pipefail - buildevents cmd "$ROOT_PIPELINE_ID" "$CI_JOB_NAME" build-command -- \ + buildevents cmd "$CI_JOB_ID" "$CI_JOB_NAME" build-command -- \ cargo build --release diff --git a/.github/workflows/release-testing.yml b/.github/workflows/release-testing.yml index 86de95a3eee..c5e0834344c 100644 --- a/.github/workflows/release-testing.yml +++ b/.github/workflows/release-testing.yml @@ -12,11 +12,11 @@ concurrency: env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} + CI_JOB_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.ref_name }} - ROOT_PIPELINE_ID: ${{ github.run_id }} RUSTFLAGS: "--remap-path-prefix=${CI_PROJECT_DIR}=/ic" BUILDEVENT_DATASET: "github-ci-dfinity" jobs: diff --git a/.github/workflows/schedule-daily.yml b/.github/workflows/schedule-daily.yml index 1c26d5cc83d..f2ba8e2f2f2 100644 --- a/.github/workflows/schedule-daily.yml +++ b/.github/workflows/schedule-daily.yml @@ -8,10 +8,10 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} + CI_JOB_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} - ROOT_PIPELINE_ID: ${{ github.run_id }} BUILDEVENT_DATASET: "github-ci-dfinity" jobs: bazel-test-bare-metal: From f6036b58e3f3c5b997d377f3e56ab05aed22aff6 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Thu, 26 Sep 2024 21:08:19 +0200 Subject: [PATCH 04/16] keep --- bazel/workspace_status.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bazel/workspace_status.sh b/bazel/workspace_status.sh index 484dc2a6ddf..0d9305b8a6f 100755 --- a/bazel/workspace_status.sh +++ b/bazel/workspace_status.sh @@ -23,6 +23,7 @@ echo "STABLE_WORKSPACE_ROOT ${WORKSPACE_ROOT}" echo "HOME ${HOME}" +test -n "${CI_JOB_ID:-}" && echo "CI_JOB_ID ${CI_JOB_ID}" test -n "${CI_JOB_NAME:-}" && echo "CI_JOB_NAME ${CI_JOB_NAME}" test -n "${CI_RUNNER_TAGS:-}" && echo "CI_RUNNER_TAGS ${CI_RUNNER_TAGS}" From 1ca1d082ddee8e36aa33064b5d36525fb0c8abb6 Mon Sep 17 00:00:00 2001 From: Carly Gundy Date: Tue, 1 Oct 2024 10:57:18 +0200 Subject: [PATCH 05/16] rename --- .github/workflows-source/ci-main.yml | 18 +++++++++--------- .github/workflows-source/release-testing.yml | 2 +- .github/workflows-source/schedule-daily.yml | 2 +- .github/workflows-source/schedule-hourly.yml | 2 +- .github/workflows/ci-main.yml | 18 +++++++++--------- .github/workflows/release-testing.yml | 2 +- .github/workflows/schedule-daily.yml | 2 +- .github/workflows/schedule-hourly.yml | 2 +- .github/workflows/schedule-rust-bench.yml | 2 +- .github/workflows/system-tests-k8s.yml | 2 +- bazel/workspace_status.sh | 2 +- ci/bazel-scripts/main.sh | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows-source/ci-main.yml b/.github/workflows-source/ci-main.yml index 572e7212c88..20f0631ec3d 100644 --- a/.github/workflows-source/ci-main.yml +++ b/.github/workflows-source/ci-main.yml @@ -22,7 +22,7 @@ permissions: read-all env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.run_id }} + CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} @@ -173,7 +173,7 @@ jobs: BAZEL_CI_CONFIG: "--config=ci --config macos_ci" BAZEL_COMMAND: test BAZEL_EXTRA_ARGS: '--test_tag_filters=test_macos' - BAZEL_STARTUP_ARGS: "--output_base /var/tmp/bazel-output/${CI_JOB_ID}" + BAZEL_STARTUP_ARGS: "--output_base /var/tmp/bazel-output/${CI_RUN_ID}" BAZEL_TARGETS: "//rs/... //publish/binaries/..." HONEYCOMB_API_TOKEN: ${{ secrets.HONEYCOMB_API_TOKEN }} - <<: *bazel-bep @@ -248,12 +248,12 @@ jobs: run: | set -eExuo pipefail REPO_NAME="${GITHUB_REPOSITORY##*/}" - rm -rf "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}" - mkdir -p "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}/artifacts" - ln -s "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}/artifacts" /__w/$REPO_NAME/$REPO_NAME/artifacts - buildevents cmd "$CI_JOB_ID" "$CI_JOB_NAME" build-command -- \ + rm -rf "/cache/job/${CI_JOB_NAME}/${CI_RUN_ID}" + mkdir -p "/cache/job/${CI_JOB_NAME}/${CI_RUN_ID}/artifacts" + ln -s "/cache/job/${CI_JOB_NAME}/${CI_RUN_ID}/artifacts" /__w/$REPO_NAME/$REPO_NAME/artifacts + buildevents cmd "$CI_RUN_ID" "$CI_JOB_NAME" build-command -- \ "$CI_PROJECT_DIR"/ci/scripts/run-build-ic.sh - rm -rf "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}" + rm -rf "/cache/job/${CI_JOB_NAME}/${CI_RUN_ID}" env: BAZEL_COMMAND: "build" RUN_ON_DIFF_ONLY: ${{ !contains(github.event.pull_request.labels.*.name, 'CI_ALL_BAZEL_TARGETS') }} @@ -344,7 +344,7 @@ jobs: shell: bash run: | set -eExuo pipefail - buildevents cmd "$CI_JOB_ID" "$CI_JOB_NAME" build-command -- \ + buildevents cmd "$CI_RUN_ID" "$CI_JOB_NAME" build-command -- \ "$CI_PROJECT_DIR"/ci/scripts/rust-lint.sh cargo-build-release-linux: @@ -373,5 +373,5 @@ jobs: shell: bash run: | set -eExuo pipefail - buildevents cmd "$CI_JOB_ID" "$CI_JOB_NAME" build-command -- \ + buildevents cmd "$CI_RUN_ID" "$CI_JOB_NAME" build-command -- \ cargo build --release diff --git a/.github/workflows-source/release-testing.yml b/.github/workflows-source/release-testing.yml index e76fe37b1d1..2cb10685749 100644 --- a/.github/workflows-source/release-testing.yml +++ b/.github/workflows-source/release-testing.yml @@ -15,7 +15,7 @@ concurrency: env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.run_id }} + CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/.github/workflows-source/schedule-daily.yml b/.github/workflows-source/schedule-daily.yml index 0c140ab8f10..910a3ff0ba9 100644 --- a/.github/workflows-source/schedule-daily.yml +++ b/.github/workflows-source/schedule-daily.yml @@ -10,7 +10,7 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.run_id }} + CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/.github/workflows-source/schedule-hourly.yml b/.github/workflows-source/schedule-hourly.yml index d84203d1c4d..b1be7a7635b 100644 --- a/.github/workflows-source/schedule-hourly.yml +++ b/.github/workflows-source/schedule-hourly.yml @@ -9,7 +9,7 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.run_id }} + CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index edc88fc3b15..51225c53c63 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -18,7 +18,7 @@ permissions: read-all env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.run_id }} + CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} @@ -173,7 +173,7 @@ jobs: BAZEL_CI_CONFIG: "--config=ci --config macos_ci" BAZEL_COMMAND: test BAZEL_EXTRA_ARGS: '--test_tag_filters=test_macos' - BAZEL_STARTUP_ARGS: "--output_base /var/tmp/bazel-output/${CI_JOB_ID}" + BAZEL_STARTUP_ARGS: "--output_base /var/tmp/bazel-output/${CI_RUN_ID}" BAZEL_TARGETS: "//rs/... //publish/binaries/..." HONEYCOMB_API_TOKEN: ${{ secrets.HONEYCOMB_API_TOKEN }} - name: Upload bazel-bep @@ -334,12 +334,12 @@ jobs: run: | set -eExuo pipefail REPO_NAME="${GITHUB_REPOSITORY##*/}" - rm -rf "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}" - mkdir -p "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}/artifacts" - ln -s "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}/artifacts" /__w/$REPO_NAME/$REPO_NAME/artifacts - buildevents cmd "$CI_JOB_ID" "$CI_JOB_NAME" build-command -- \ + rm -rf "/cache/job/${CI_JOB_NAME}/${CI_RUN_ID}" + mkdir -p "/cache/job/${CI_JOB_NAME}/${CI_RUN_ID}/artifacts" + ln -s "/cache/job/${CI_JOB_NAME}/${CI_RUN_ID}/artifacts" /__w/$REPO_NAME/$REPO_NAME/artifacts + buildevents cmd "$CI_RUN_ID" "$CI_JOB_NAME" build-command -- \ "$CI_PROJECT_DIR"/ci/scripts/run-build-ic.sh - rm -rf "/cache/job/${CI_JOB_NAME}/${CI_JOB_ID}" + rm -rf "/cache/job/${CI_JOB_NAME}/${CI_RUN_ID}" env: BAZEL_COMMAND: "build" RUN_ON_DIFF_ONLY: ${{ !contains(github.event.pull_request.labels.*.name, 'CI_ALL_BAZEL_TARGETS') }} @@ -440,7 +440,7 @@ jobs: shell: bash run: | set -eExuo pipefail - buildevents cmd "$CI_JOB_ID" "$CI_JOB_NAME" build-command -- \ + buildevents cmd "$CI_RUN_ID" "$CI_JOB_NAME" build-command -- \ "$CI_PROJECT_DIR"/ci/scripts/rust-lint.sh cargo-build-release-linux: name: Cargo Build Release Linux @@ -477,5 +477,5 @@ jobs: shell: bash run: | set -eExuo pipefail - buildevents cmd "$CI_JOB_ID" "$CI_JOB_NAME" build-command -- \ + buildevents cmd "$CI_RUN_ID" "$CI_JOB_NAME" build-command -- \ cargo build --release diff --git a/.github/workflows/release-testing.yml b/.github/workflows/release-testing.yml index c5e0834344c..55420dba2a2 100644 --- a/.github/workflows/release-testing.yml +++ b/.github/workflows/release-testing.yml @@ -12,7 +12,7 @@ concurrency: env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.run_id }} + CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/.github/workflows/schedule-daily.yml b/.github/workflows/schedule-daily.yml index f2ba8e2f2f2..5cac61ca06a 100644 --- a/.github/workflows/schedule-daily.yml +++ b/.github/workflows/schedule-daily.yml @@ -8,7 +8,7 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.run_id }} + CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/.github/workflows/schedule-hourly.yml b/.github/workflows/schedule-hourly.yml index a1cbefa1151..3e5f5de921d 100644 --- a/.github/workflows/schedule-hourly.yml +++ b/.github/workflows/schedule-hourly.yml @@ -7,7 +7,7 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.run_id }} + CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/.github/workflows/schedule-rust-bench.yml b/.github/workflows/schedule-rust-bench.yml index 0f243b82e7d..e3b378fa943 100644 --- a/.github/workflows/schedule-rust-bench.yml +++ b/.github/workflows/schedule-rust-bench.yml @@ -10,7 +10,7 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.run_id }} + CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/.github/workflows/system-tests-k8s.yml b/.github/workflows/system-tests-k8s.yml index f5217e0b94d..8550153c072 100644 --- a/.github/workflows/system-tests-k8s.yml +++ b/.github/workflows/system-tests-k8s.yml @@ -35,7 +35,7 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_JOB_ID: ${{ github.run_id }} + CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} diff --git a/bazel/workspace_status.sh b/bazel/workspace_status.sh index 0d9305b8a6f..c537a11bbf0 100755 --- a/bazel/workspace_status.sh +++ b/bazel/workspace_status.sh @@ -23,7 +23,7 @@ echo "STABLE_WORKSPACE_ROOT ${WORKSPACE_ROOT}" echo "HOME ${HOME}" -test -n "${CI_JOB_ID:-}" && echo "CI_JOB_ID ${CI_JOB_ID}" +test -n "${CI_RUN_ID:-}" && echo "CI_RUN_ID ${CI_RUN_ID}" test -n "${CI_JOB_NAME:-}" && echo "CI_JOB_NAME ${CI_JOB_NAME}" test -n "${CI_RUNNER_TAGS:-}" && echo "CI_RUNNER_TAGS ${CI_RUNNER_TAGS}" diff --git a/ci/bazel-scripts/main.sh b/ci/bazel-scripts/main.sh index 92d4ef445c9..ba95213ced5 100755 --- a/ci/bazel-scripts/main.sh +++ b/ci/bazel-scripts/main.sh @@ -87,7 +87,7 @@ stream_awk_program=' # shellcheck disable=SC2086 # ${BAZEL_...} variables are expected to contain several arguments. We have `set -f` set above to disable globbing (and therefore only allow splitting)" -buildevents cmd "${CI_JOB_ID}" "${CI_JOB_NAME}" "${CI_JOB_NAME}-bazel-cmd" -- bazel \ +buildevents cmd "${CI_RUN_ID}" "${CI_JOB_NAME}" "${CI_JOB_NAME}-bazel-cmd" -- bazel \ ${BAZEL_STARTUP_ARGS} \ ${BAZEL_COMMAND} \ --color=yes \ From 6863cb270307c86d56b901cb8ced1038d0e12711 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Tue, 1 Oct 2024 10:59:16 +0200 Subject: [PATCH 06/16] Update ci-main.yml --- .github/workflows-source/ci-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows-source/ci-main.yml b/.github/workflows-source/ci-main.yml index 20f0631ec3d..54fdce1df43 100644 --- a/.github/workflows-source/ci-main.yml +++ b/.github/workflows-source/ci-main.yml @@ -22,11 +22,11 @@ permissions: read-all env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + CI_RUN_ID: ${{ github.run_id }} RUSTFLAGS: "--remap-path-prefix=${CI_PROJECT_DIR}=/ic" BUILDEVENT_DATASET: "github-ci-dfinity" From 8ae653b71b6969996b2d26a426777e9f90121c58 Mon Sep 17 00:00:00 2001 From: IDX GitHub Automation Date: Tue, 1 Oct 2024 08:59:32 +0000 Subject: [PATCH 07/16] IDX GitHub Automation --- .github/workflows/ci-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 51225c53c63..52d0e9c7947 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -18,11 +18,11 @@ permissions: read-all env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + CI_RUN_ID: ${{ github.run_id }} RUSTFLAGS: "--remap-path-prefix=${CI_PROJECT_DIR}=/ic" BUILDEVENT_DATASET: "github-ci-dfinity" jobs: From d3f9849a89cc8c3c0f62ecdbf5908366a554e9ca Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Tue, 1 Oct 2024 11:00:30 +0200 Subject: [PATCH 08/16] Update release-testing.yml --- .github/workflows-source/release-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows-source/release-testing.yml b/.github/workflows-source/release-testing.yml index 2cb10685749..1a33f6a3952 100644 --- a/.github/workflows-source/release-testing.yml +++ b/.github/workflows-source/release-testing.yml @@ -15,11 +15,11 @@ concurrency: env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.ref_name }} + CI_RUN_ID: ${{ github.run_id }} RUSTFLAGS: "--remap-path-prefix=${CI_PROJECT_DIR}=/ic" BUILDEVENT_DATASET: "github-ci-dfinity" From a47ab0ea35ddfac09e7dfc84e746ce559dca3baf Mon Sep 17 00:00:00 2001 From: IDX GitHub Automation Date: Tue, 1 Oct 2024 09:00:47 +0000 Subject: [PATCH 09/16] IDX GitHub Automation --- .github/workflows/release-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-testing.yml b/.github/workflows/release-testing.yml index 55420dba2a2..9f12aea8549 100644 --- a/.github/workflows/release-testing.yml +++ b/.github/workflows/release-testing.yml @@ -12,11 +12,11 @@ concurrency: env: CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.ref_name }} + CI_RUN_ID: ${{ github.run_id }} RUSTFLAGS: "--remap-path-prefix=${CI_PROJECT_DIR}=/ic" BUILDEVENT_DATASET: "github-ci-dfinity" jobs: From 7cd2327f405d106f8120c66073cd2b5b17d5cb20 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Tue, 1 Oct 2024 11:00:50 +0200 Subject: [PATCH 10/16] Update schedule-daily.yml --- .github/workflows-source/schedule-daily.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows-source/schedule-daily.yml b/.github/workflows-source/schedule-daily.yml index 910a3ff0ba9..d5ed3408f95 100644 --- a/.github/workflows-source/schedule-daily.yml +++ b/.github/workflows-source/schedule-daily.yml @@ -10,10 +10,10 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} + CI_RUN_ID: ${{ github.run_id }} BUILDEVENT_DATASET: "github-ci-dfinity" anchors: From b7d2ddbdb10d69f1813373ebc643bd1117668082 Mon Sep 17 00:00:00 2001 From: IDX GitHub Automation Date: Tue, 1 Oct 2024 09:01:04 +0000 Subject: [PATCH 11/16] IDX GitHub Automation --- .github/workflows/schedule-daily.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/schedule-daily.yml b/.github/workflows/schedule-daily.yml index 5cac61ca06a..ac74757404b 100644 --- a/.github/workflows/schedule-daily.yml +++ b/.github/workflows/schedule-daily.yml @@ -8,10 +8,10 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} + CI_RUN_ID: ${{ github.run_id }} BUILDEVENT_DATASET: "github-ci-dfinity" jobs: bazel-test-bare-metal: From 05713073016e6fc895858279d8d877e444ba4e13 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Tue, 1 Oct 2024 11:01:10 +0200 Subject: [PATCH 12/16] Update schedule-hourly.yml --- .github/workflows-source/schedule-hourly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows-source/schedule-hourly.yml b/.github/workflows-source/schedule-hourly.yml index b1be7a7635b..95610c1ac10 100644 --- a/.github/workflows-source/schedule-hourly.yml +++ b/.github/workflows-source/schedule-hourly.yml @@ -9,10 +9,10 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} + CI_RUN_ID: ${{ github.run_id }} RUSTFLAGS: "--remap-path-prefix=${CI_PROJECT_DIR}=/ic" BUILDEVENT_DATASET: "github-ci-dfinity" From 185dd203b05a83b27e698effcf0d1423ed109705 Mon Sep 17 00:00:00 2001 From: IDX GitHub Automation Date: Tue, 1 Oct 2024 09:01:22 +0000 Subject: [PATCH 13/16] IDX GitHub Automation --- .github/workflows/schedule-hourly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/schedule-hourly.yml b/.github/workflows/schedule-hourly.yml index 3e5f5de921d..ed304472326 100644 --- a/.github/workflows/schedule-hourly.yml +++ b/.github/workflows/schedule-hourly.yml @@ -7,10 +7,10 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} + CI_RUN_ID: ${{ github.run_id }} RUSTFLAGS: "--remap-path-prefix=${CI_PROJECT_DIR}=/ic" BUILDEVENT_DATASET: "github-ci-dfinity" jobs: From 40330431251d2d8db812ef0fcee5640e6be11c93 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Tue, 1 Oct 2024 11:07:11 +0200 Subject: [PATCH 14/16] Update schedule-rust-bench.yml --- .github/workflows/schedule-rust-bench.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/schedule-rust-bench.yml b/.github/workflows/schedule-rust-bench.yml index e3b378fa943..effb61bd8e2 100644 --- a/.github/workflows/schedule-rust-bench.yml +++ b/.github/workflows/schedule-rust-bench.yml @@ -10,10 +10,10 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} + CI_RUN_ID: ${{ github.run_id }} BUILDEVENT_DATASET: "github-ci-dfinity" jobs: From a6985592a0c794dd5b71ff1d25a80c0d3b4ba6b1 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Tue, 1 Oct 2024 11:07:33 +0200 Subject: [PATCH 15/16] Update system-tests-k8s.yml --- .github/workflows/system-tests-k8s.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/system-tests-k8s.yml b/.github/workflows/system-tests-k8s.yml index 8550153c072..9921c5b1661 100644 --- a/.github/workflows/system-tests-k8s.yml +++ b/.github/workflows/system-tests-k8s.yml @@ -35,10 +35,10 @@ env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} CI_COMMIT_SHA: ${{ github.sha }} CI_JOB_NAME: ${{ github.job }} - CI_RUN_ID: ${{ github.run_id }} CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" CI_PIPELINE_SOURCE: ${{ github.event_name }} CI_PROJECT_DIR: ${{ github.workspace }} + CI_RUN_ID: ${{ github.run_id }} BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_API_TOKEN }} BUILDEVENT_DATASET: "github-ci-dfinity" From cf34f4b4028cb3e94a3d737ad83d39c519736741 Mon Sep 17 00:00:00 2001 From: Carly Gundy Date: Tue, 1 Oct 2024 11:30:29 +0200 Subject: [PATCH 16/16] retrigger