diff options
| author | Ralf Jung <post@ralfj.de> | 2023-07-10 10:16:05 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2023-07-10 10:16:05 +0200 |
| commit | a3fdf75d126a02da4c27fd9e1cc16bdc93a5f133 (patch) | |
| tree | 5803fda00e2ed5bfbff938e19453324144075fa4 /src/ci/github-actions | |
| parent | d4034a2035d67637e044876c1e5801ef68d29889 (diff) | |
| parent | 743333f3dd90721461c09387ec73d09c080d5f5f (diff) | |
| download | rust-a3fdf75d126a02da4c27fd9e1cc16bdc93a5f133.tar.gz rust-a3fdf75d126a02da4c27fd9e1cc16bdc93a5f133.zip | |
Merge from rustc
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 24fc72e660a..b5b478e60f4 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -302,7 +302,7 @@ concurrency: # For a given workflow, if we push to the same branch, cancel all previous builds on that branch. # We add an exception for try builds (try branch) and unrolled rollup builds (try-perf), which # are all triggered on the same branch, but which should be able to run concurrently. - group: ${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }} + group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }} cancel-in-progress: true jobs: @@ -643,7 +643,7 @@ jobs: --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler - SCRIPT: PGO_HOST=x86_64-pc-windows-msvc python src/ci/stage-build.py python x.py dist bootstrap --include-default-paths + SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist python x.py dist bootstrap --include-default-paths DIST_REQUIRE_ALL_TOOLS: 1 <<: *job-windows-8c |