about summary refs log tree commit diff
path: root/.github/workflows/ci.yml
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-05-09 10:39:50 +0000
committerbors <bors@rust-lang.org>2024-05-09 10:39:50 +0000
commit6f7e00a3e6eade8350ce6280f05596236d73c4cb (patch)
tree28075ba59f41cf64c6144534f2cbc807496a77ba /.github/workflows/ci.yml
parentcb93c24bf36b3367714516fc2308cf6856916eeb (diff)
parentb3e9060178780b51c21b50c30f04f2b3d339164a (diff)
downloadrust-6f7e00a3e6eade8350ce6280f05596236d73c4cb.tar.gz
rust-6f7e00a3e6eade8350ce6280f05596236d73c4cb.zip
Auto merge of #124743 - Kobzol:arbitrary-try-build, r=pietroalbini
CI: enable arbitrary try builds, take two

Fixed version of https://github.com/rust-lang/rust/pull/124631, which hopefully won't completely break our CI this time :man_facepalming: Sorry once again. Only the last commit is new.

r? `@pietroalbini`
Diffstat (limited to '.github/workflows/ci.yml')
-rw-r--r--.github/workflows/ci.yml10
1 files changed, 2 insertions, 8 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a2769a2c274..5364c1e9f46 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,6 +52,8 @@ jobs:
       - name: Checkout the source code
         uses: actions/checkout@v4
       - name: Calculate the CI job matrix
+        env:
+          COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
         run: python3 src/ci/github-actions/calculate-job-matrix.py >> $GITHUB_OUTPUT
         id: jobs
   job:
@@ -75,14 +77,6 @@ jobs:
       matrix:
         # Check the `calculate_matrix` job to see how is the matrix defined.
         include: ${{ fromJSON(needs.calculate_matrix.outputs.jobs) }}
-    # GitHub Actions fails the workflow if an empty list of jobs is provided to
-    # the workflow, so we need to skip this job if nothing was produced by
-    # the Python script.
-    #
-    # Unfortunately checking whether a list is empty is not possible in a nice
-    # way due to GitHub Actions expressions limits.
-    # This hack is taken from https://github.com/ferrocene/ferrocene/blob/d43edc6b7697cf1719ec1c17c54904ab94825763/.github/workflows/release.yml#L75-L82
-    if: fromJSON(needs.calculate_matrix.outputs.jobs)[0] != null
     steps:
       - if: contains(matrix.os, 'windows')
         uses: msys2/setup-msys2@v2.22.0