Skip to content

Commit c189755

Browse files
WojciechMazurWojciechMazur
committed
Use GITHUB_WORKSPACE and GITHUB_REPOSITORY instead of hard-coded values
1 parent 8e366a2 commit c189755

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎.github/workflows/ci.yaml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
## Workaround for https://github.com/actions/runner/issues/2033 (See https://github.com/scala/scala3/pull/19720)
7373
- name: Reset existing repo
7474
run: |
75-
git config --global --add safe.directory /__w/scala3/scala3
75+
git config --global --add safe.directory $GITHUB_WORKSPACE
7676
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
7777
7878
- name: Checkout cleanup script
@@ -125,7 +125,7 @@ jobs:
125125

126126
- name: Reset existing repo
127127
run: |
128-
git config --global --add safe.directory /__w/scala3/scala3
128+
git config --global --add safe.directory $GITHUB_WORKSPACE
129129
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
130130
131131
- name: Checkout cleanup script
@@ -168,7 +168,7 @@ jobs:
168168
- name: Reset existing repo
169169
shell: cmd
170170
run: |
171-
git config --global --add safe.directory /__w/scala3/scala3
171+
git config --global --add safe.directory $GITHUB_WORKSPACE
172172
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
173173
174174
- name: Git Checkout
@@ -212,7 +212,7 @@ jobs:
212212
- name: Reset existing repo
213213
shell: cmd
214214
run: |
215-
git config --global --add safe.directory /__w/scala3/scala3
215+
git config --global --add safe.directory $GITHUB_WORKSPACE
216216
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
217217
218218
- name: Git Checkout
@@ -254,7 +254,7 @@ jobs:
254254

255255
- name: Reset existing repo
256256
run: |
257-
git config --global --add safe.directory /__w/scala3/scala3
257+
git config --global --add safe.directory $GITHUB_WORKSPACE
258258
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
259259
260260
- name: Checkout cleanup script
@@ -301,7 +301,7 @@ jobs:
301301
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
302302
- name: Reset existing repo
303303
run: |
304-
git config --global --add safe.directory /__w/scala3/scala3
304+
git config --global --add safe.directory $GITHUB_WORKSPACE
305305
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
306306
307307
- name: Checkout cleanup script
@@ -318,7 +318,7 @@ jobs:
318318

319319
- name: Test
320320
run: |
321-
git config --global --add safe.directory /__w/scala3/scala3
321+
git config --global --add safe.directory $GITHUB_WORKSPACE
322322
git submodule sync
323323
git submodule update --init --recursive --jobs 7
324324
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
@@ -355,7 +355,7 @@ jobs:
355355
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
356356
- name: Reset existing repo
357357
run: |
358-
git config --global --add safe.directory /__w/scala3/scala3
358+
git config --global --add safe.directory $GITHUB_WORKSPACE
359359
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
360360
361361
- name: Checkout cleanup script
@@ -372,7 +372,7 @@ jobs:
372372

373373
- name: Test
374374
run: |
375-
git config --global --add safe.directory /__w/scala3/scala3
375+
git config --global --add safe.directory $GITHUB_WORKSPACE
376376
git submodule sync
377377
git submodule update --init --recursive --jobs 7
378378
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
@@ -409,7 +409,7 @@ jobs:
409409
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
410410
- name: Reset existing repo
411411
run: |
412-
git config --global --add safe.directory /__w/scala3/scala3
412+
git config --global --add safe.directory $GITHUB_WORKSPACE
413413
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
414414
415415
- name: Checkout cleanup script
@@ -426,7 +426,7 @@ jobs:
426426

427427
- name: Test
428428
run: |
429-
git config --global --add safe.directory /__w/scala3/scala3
429+
git config --global --add safe.directory $GITHUB_WORKSPACE
430430
git submodule sync
431431
git submodule update --init --recursive --jobs 7
432432
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
@@ -462,7 +462,7 @@ jobs:
462462

463463
- name: Reset existing repo
464464
run: |
465-
git config --global --add safe.directory /__w/scala3/scala3
465+
git config --global --add safe.directory $GITHUB_WORKSPACE
466466
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
467467
468468
- name: Checkout cleanup script
@@ -511,7 +511,7 @@ jobs:
511511

512512
- name: Reset existing repo
513513
run: |
514-
git config --global --add safe.directory /__w/scala3/scala3
514+
git config --global --add safe.directory $GITHUB_WORKSPACE
515515
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
516516
517517
- name: Checkout cleanup script
@@ -559,7 +559,7 @@ jobs:
559559
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
560560
- name: Reset existing repo
561561
run: |
562-
git config --global --add safe.directory /__w/scala3/scala3
562+
git config --global --add safe.directory $GITHUB_WORKSPACE
563563
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
564564
565565
- name: Checkout cleanup script
@@ -623,7 +623,7 @@ jobs:
623623
steps:
624624
- name: Reset existing repo
625625
run: |
626-
git config --global --add safe.directory /__w/scala3/scala3
626+
git config --global --add safe.directory $GITHUB_WORKSPACE
627627
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
628628
629629
- name: Checkout cleanup script
@@ -640,7 +640,7 @@ jobs:
640640

641641
- name: Generate Website
642642
run: |
643-
git config --global --add safe.directory /__w/scala3/scala3
643+
git config --global --add safe.directory $GITHUB_WORKSPACE
644644
./project/scripts/genDocs -doc-snapshot
645645
646646
- name: Deploy Website to dotty-website
@@ -678,7 +678,7 @@ jobs:
678678
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
679679
- name: Reset existing repo
680680
run: |
681-
git config --global --add safe.directory /__w/scala3/scala3
681+
git config --global --add safe.directory $GITHUB_WORKSPACE
682682
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
683683
684684
- name: Checkout cleanup script

‎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)