Skip to content

Commit 8f5b0e0

Browse files
WojciechMazurWojciechMazur
authored
[CI]: Use GITHUB_WORKSPACE and GITHUB_REPOSITORY instead of hard-coded values (scala#22418)
Replace hard coded values to allow for easier testing in the forks of the scala/scala3 repository, especially in https://github.com/scala/scala3-lts
2 parents db23c08 + 7bf9bc2 commit 8f5b0e0

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
## Workaround for https://github.com/actions/runner/issues/2033 (See https://github.com/scala/scala3/pull/19720)
8181
- name: Reset existing repo
8282
run: |
83-
git config --global --add safe.directory /__w/scala3/scala3
83+
git config --global --add safe.directory $GITHUB_WORKSPACE
8484
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
8585
8686
- name: Checkout cleanup script
@@ -133,7 +133,7 @@ jobs:
133133

134134
- name: Reset existing repo
135135
run: |
136-
git config --global --add safe.directory /__w/scala3/scala3
136+
git config --global --add safe.directory $GITHUB_WORKSPACE
137137
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
138138
139139
- name: Checkout cleanup script
@@ -190,7 +190,7 @@ jobs:
190190

191191
- name: Reset existing repo
192192
run: |
193-
git config --global --add safe.directory /__w/scala3/scala3
193+
git config --global --add safe.directory $GITHUB_WORKSPACE
194194
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
195195
196196
- name: Checkout cleanup script
@@ -229,7 +229,7 @@ jobs:
229229
- name: Reset existing repo
230230
shell: cmd
231231
run: |
232-
git config --global --add safe.directory /__w/scala3/scala3
232+
git config --global --add safe.directory $GITHUB_WORKSPACE
233233
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
234234
235235
- name: Git Checkout
@@ -273,7 +273,7 @@ jobs:
273273
- name: Reset existing repo
274274
shell: cmd
275275
run: |
276-
git config --global --add safe.directory /__w/scala3/scala3
276+
git config --global --add safe.directory $GITHUB_WORKSPACE
277277
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
278278
279279
- name: Git Checkout
@@ -319,7 +319,7 @@ jobs:
319319

320320
- name: Reset existing repo
321321
run: |
322-
git config --global --add safe.directory /__w/scala3/scala3
322+
git config --global --add safe.directory $GITHUB_WORKSPACE
323323
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
324324
325325
- name: Checkout cleanup script
@@ -374,7 +374,7 @@ jobs:
374374
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
375375
- name: Reset existing repo
376376
run: |
377-
git config --global --add safe.directory /__w/scala3/scala3
377+
git config --global --add safe.directory $GITHUB_WORKSPACE
378378
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
379379
380380
- name: Checkout cleanup script
@@ -391,7 +391,7 @@ jobs:
391391

392392
- name: Test
393393
run: |
394-
git config --global --add safe.directory /__w/scala3/scala3
394+
git config --global --add safe.directory $GITHUB_WORKSPACE
395395
git submodule sync
396396
git submodule update --init --recursive --jobs 7
397397
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
@@ -431,7 +431,7 @@ jobs:
431431
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
432432
- name: Reset existing repo
433433
run: |
434-
git config --global --add safe.directory /__w/scala3/scala3
434+
git config --global --add safe.directory $GITHUB_WORKSPACE
435435
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
436436
437437
- name: Checkout cleanup script
@@ -448,7 +448,7 @@ jobs:
448448

449449
- name: Test
450450
run: |
451-
git config --global --add safe.directory /__w/scala3/scala3
451+
git config --global --add safe.directory $GITHUB_WORKSPACE
452452
git submodule sync
453453
git submodule update --init --recursive --jobs 7
454454
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
@@ -488,7 +488,7 @@ jobs:
488488
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
489489
- name: Reset existing repo
490490
run: |
491-
git config --global --add safe.directory /__w/scala3/scala3
491+
git config --global --add safe.directory $GITHUB_WORKSPACE
492492
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
493493
494494
- name: Checkout cleanup script
@@ -505,7 +505,7 @@ jobs:
505505

506506
- name: Test
507507
run: |
508-
git config --global --add safe.directory /__w/scala3/scala3
508+
git config --global --add safe.directory $GITHUB_WORKSPACE
509509
git submodule sync
510510
git submodule update --init --recursive --jobs 7
511511
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
@@ -541,7 +541,7 @@ jobs:
541541

542542
- name: Reset existing repo
543543
run: |
544-
git config --global --add safe.directory /__w/scala3/scala3
544+
git config --global --add safe.directory $GITHUB_WORKSPACE
545545
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
546546
547547
- name: Checkout cleanup script
@@ -593,7 +593,7 @@ jobs:
593593

594594
- name: Reset existing repo
595595
run: |
596-
git config --global --add safe.directory /__w/scala3/scala3
596+
git config --global --add safe.directory $GITHUB_WORKSPACE
597597
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
598598
599599
- name: Checkout cleanup script
@@ -648,7 +648,7 @@ jobs:
648648
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
649649
- name: Reset existing repo
650650
run: |
651-
git config --global --add safe.directory /__w/scala3/scala3
651+
git config --global --add safe.directory $GITHUB_WORKSPACE
652652
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
653653
654654
- name: Checkout cleanup script
@@ -706,7 +706,7 @@ jobs:
706706
steps:
707707
- name: Reset existing repo
708708
run: |
709-
git config --global --add safe.directory /__w/scala3/scala3
709+
git config --global --add safe.directory $GITHUB_WORKSPACE
710710
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
711711
712712
- name: Checkout cleanup script
@@ -723,7 +723,7 @@ jobs:
723723

724724
- name: Generate Website
725725
run: |
726-
git config --global --add safe.directory /__w/scala3/scala3
726+
git config --global --add safe.directory $GITHUB_WORKSPACE
727727
./project/scripts/genDocs -doc-snapshot
728728
729729
- name: Deploy Website to https://dotty.epfl.ch
@@ -764,7 +764,7 @@ jobs:
764764
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
765765
- name: Reset existing repo
766766
run: |
767-
git config --global --add safe.directory /__w/scala3/scala3
767+
git config --global --add safe.directory $GITHUB_WORKSPACE
768768
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
769769
770770
- name: Checkout cleanup script
@@ -826,15 +826,15 @@ jobs:
826826
path: .
827827
- name: Prepare MSI package
828828
shell: bash
829-
run: |
829+
run: |
830830
msiInstaller="scala3-${{ env.RELEASE_TAG }}.msi"
831831
mv scala.msi "${msiInstaller}"
832832
sha256sum "${msiInstaller}" > "${msiInstaller}.sha256"
833833
834834
- name: Install GH CLI
835835
uses: dev-hanz-ops/[email protected]
836836
with:
837-
gh-cli-version: 2.59.0
837+
gh-cli-version: 2.59.0
838838

839839
# Create the GitHub release
840840
- name: Create GitHub Release
@@ -844,7 +844,7 @@ jobs:
844844
run: |
845845
# We need to config safe.directory in every step that might reference git
846846
# It is not persisted between steps
847-
git config --global --add safe.directory /__w/scala3/scala3
847+
git config --global --add safe.directory $GITHUB_WORKSPACE
848848
gh release create \
849849
--draft \
850850
--title "${{ env.RELEASE_TAG }}" \

‎project/scripts/cmdScaladocTests‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ DOTTY_NONBOOTSTRAPPED_VERSION=$(eval $DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND | ta
1616
DOTTY_BOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyVersion)\""
1717
DOTTY_BOOTSTRAPPED_VERSION=$(eval $DOTTY_BOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1)
1818

19-
SOURCE_LINKS_REPOSITORY="scala/scala3"
19+
SOURCE_LINKS_REPOSITORY="${GITHUB_REPOSITORY:-scala/scala3}"
2020
SOURCE_LINKS_VERSION="${GITHUB_SHA:-$DOTTY_BOOTSTRAPPED_VERSION}"
2121

2222
"$SBT" "scaladoc/generateTestcasesDocumentation" > "$tmp" 2>&1 || echo "generated testcases project with sbt"

0 commit comments

Comments
 (0)