From 3d59b8310cecf4962c175724c104bd8d2cdf7fa1 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Tue, 10 Dec 2024 21:17:02 +0100 Subject: [PATCH] try use group --- .github/workflows/ci.yaml | 56 ++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6969a95d07f9..10aefcffd896 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,8 +37,8 @@ concurrency: env: DOTTY_CI_RUN: true DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - -# In this file, we set `--cpu-shares 4096` on every job. This might seem useless + + # In this file, we set `--cpu-shares 4096` on every job. This might seem useless # since it means that every container has the same weight which should be # equivalent to doing nothing, but it turns out that OpenJDK computes # `Runtime.getRuntime.availableProcessors` by dividing the cpu-shares value if @@ -54,7 +54,9 @@ env: jobs: test_non_bootstrapped: - runs-on: ${{ github.repository == 'scala/scala3' && 'Linux' || 'ubuntu-latest' }} + runs-on: + group: Default + labels: Linux container: image: wojciechmazur95/dotty:2024-12-10-test options: --cpu-shares 4096 @@ -105,7 +107,9 @@ jobs: ./project/scripts/cmdTests test: - runs-on: ${{ github.repository == 'scala/scala3' && 'Linux' || 'ubuntu-latest' }} + runs-on: + group: Default + labels: Linux container: image: wojciechmazur95/dotty:2024-12-10-test options: --cpu-shares 4096 @@ -164,7 +168,9 @@ jobs: run: ./project/scripts/sbt ";set ThisBuild/Build.scala2Library := Build.Scala2LibraryCCTasty; scala2-library-cc/compile; scala2-library-cc-tasty/compile; scala3-bootstrapped/testCompilation i3" test_scala2_library_tasty: - runs-on: ${{ github.repository == 'scala/scala3' && 'Linux' || 'ubuntu-latest' }} + runs-on: + group: Default + labels: Linux container: image: wojciechmazur95/dotty:2024-12-10-test options: --cpu-shares 4096 @@ -288,7 +294,9 @@ jobs: mima: name: MiMa - runs-on: ${{ github.repository == 'scala/scala3' && 'Linux' || 'ubuntu-latest' }} + runs-on: + group: Default + labels: Linux container: image: wojciechmazur95/dotty:2024-12-10-test options: --cpu-shares 4096 @@ -338,7 +346,9 @@ jobs: ./project/scripts/scala2-library-tasty-mima.sh community_build_a: - runs-on: ${{ github.repository == 'scala/scala3' && 'Linux' || 'ubuntu-latest' }} + runs-on: + group: Default + labels: Linux container: image: wojciechmazur95/dotty:2024-12-10-test options: --cpu-shares 4096 @@ -393,7 +403,9 @@ jobs: run: cat community-build/dotty-community-build-deps || true community_build_b: - runs-on: ${{ github.repository == 'scala/scala3' && 'Linux' || 'ubuntu-latest' }} + runs-on: + group: Default + labels: Linux container: image: wojciechmazur95/dotty:2024-12-10-test options: --cpu-shares 4096 @@ -448,7 +460,9 @@ jobs: run: cat community-build/dotty-community-build-deps || true community_build_c: - runs-on: ${{ github.repository == 'scala/scala3' && 'Linux' || 'ubuntu-latest' }} + runs-on: + group: Default + labels: Linux container: image: wojciechmazur95/dotty:2024-12-10-test options: --cpu-shares 4096 @@ -503,7 +517,9 @@ jobs: run: cat community-build/dotty-community-build-deps || true test_sbt: - runs-on: ${{ github.repository == 'scala/scala3' && 'Linux' || 'ubuntu-latest' }} + runs-on: + group: Default + labels: Linux container: image: wojciechmazur95/dotty:2024-12-10-test options: --cpu-shares 4096 @@ -547,7 +563,9 @@ jobs: run: ./project/scripts/sbt "sbt-test/scripted; sbt-community-build/scripted" test_java8: - runs-on: ${{ github.repository == 'scala/scala3' && 'Linux' || 'ubuntu-latest' }} + runs-on: + group: Default + labels: Linux container: image: wojciechmazur95/dotty:2024-12-10-test options: --cpu-shares 4096 @@ -606,7 +624,9 @@ jobs: ./project/scripts/sbt ";sjsSandbox/run ;sjsSandbox/test ;sjsJUnitTests/test ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToESModules ;sjsJUnitTests/test ;sjsCompilerTests/test" publish_nightly: - runs-on: ${{ github.repository == 'scala/scala3' && 'Linux' || 'ubuntu-latest' }} + runs-on: + group: Default + labels: Linux container: image: wojciechmazur95/dotty:2024-12-10-test options: --cpu-shares 4096 @@ -676,7 +696,9 @@ jobs: ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonatypeBundleRelease" nightly_documentation: - runs-on: ${{ github.repository == 'scala/scala3' && 'Linux' || 'ubuntu-latest' }} + runs-on: + group: Default + labels: Linux container: image: wojciechmazur95/dotty:2024-12-10-test options: --cpu-shares 4096 @@ -720,7 +742,9 @@ jobs: publish_release: permissions: contents: write # for actions/create-release to create a release - runs-on: ${{ github.repository == 'scala/scala3' && 'Linux' || 'ubuntu-latest' }} + runs-on: + group: Default + labels: Linux container: image: wojciechmazur95/dotty:2024-12-10-test options: --cpu-shares 4096 @@ -1129,7 +1153,9 @@ jobs: open_issue_on_failure: - runs-on: ${{ github.repository == 'scala/scala3' && 'Linux' || 'ubuntu-latest' }} + runs-on: + group: Default + labels: Linux container: image: wojciechmazur95/dotty:2024-12-10-test needs: [nightly_documentation, test_windows_full]