diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b6bd9c319b1c..17445741f07c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -80,7 +80,7 @@ jobs: ## Workaround for https://github.com/actions/runner/issues/2033 (See https://github.com/scala/scala3/pull/19720) - name: Reset existing repo run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true - name: Checkout cleanup script @@ -133,7 +133,7 @@ jobs: - name: Reset existing repo run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true - name: Checkout cleanup script @@ -190,7 +190,7 @@ jobs: - name: Reset existing repo run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true - name: Checkout cleanup script @@ -229,7 +229,7 @@ jobs: - name: Reset existing repo shell: cmd run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true - name: Git Checkout @@ -273,7 +273,7 @@ jobs: - name: Reset existing repo shell: cmd run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true - name: Git Checkout @@ -319,7 +319,7 @@ jobs: - name: Reset existing repo run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true - name: Checkout cleanup script @@ -374,7 +374,7 @@ jobs: run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH - name: Reset existing repo run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true - name: Checkout cleanup script @@ -391,7 +391,7 @@ jobs: - name: Test run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git submodule sync git submodule update --init --recursive --jobs 7 ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA" @@ -431,7 +431,7 @@ jobs: run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH - name: Reset existing repo run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true - name: Checkout cleanup script @@ -448,7 +448,7 @@ jobs: - name: Test run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git submodule sync git submodule update --init --recursive --jobs 7 ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB" @@ -488,7 +488,7 @@ jobs: run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH - name: Reset existing repo run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true - name: Checkout cleanup script @@ -505,7 +505,7 @@ jobs: - name: Test run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git submodule sync git submodule update --init --recursive --jobs 7 ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC" @@ -541,7 +541,7 @@ jobs: - name: Reset existing repo run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true - name: Checkout cleanup script @@ -593,7 +593,7 @@ jobs: - name: Reset existing repo run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true - name: Checkout cleanup script @@ -648,7 +648,7 @@ jobs: run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH - name: Reset existing repo run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true - name: Checkout cleanup script @@ -706,7 +706,7 @@ jobs: steps: - name: Reset existing repo run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true - name: Checkout cleanup script @@ -723,7 +723,7 @@ jobs: - name: Generate Website run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE ./project/scripts/genDocs -doc-snapshot - name: Deploy Website to https://dotty.epfl.ch @@ -764,7 +764,7 @@ jobs: run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH - name: Reset existing repo run: | - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true - name: Checkout cleanup script @@ -826,7 +826,7 @@ jobs: path: . - name: Prepare MSI package shell: bash - run: | + run: | msiInstaller="scala3-${{ env.RELEASE_TAG }}.msi" mv scala.msi "${msiInstaller}" sha256sum "${msiInstaller}" > "${msiInstaller}.sha256" @@ -834,7 +834,7 @@ jobs: - name: Install GH CLI uses: dev-hanz-ops/install-gh-cli-action@v0.2.0 with: - gh-cli-version: 2.59.0 + gh-cli-version: 2.59.0 # Create the GitHub release - name: Create GitHub Release @@ -844,7 +844,7 @@ jobs: run: | # We need to config safe.directory in every step that might reference git # It is not persisted between steps - git config --global --add safe.directory /__w/scala3/scala3 + git config --global --add safe.directory $GITHUB_WORKSPACE gh release create \ --draft \ --title "${{ env.RELEASE_TAG }}" \ diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests index b54789032ad2..e53ffd87ebff 100755 --- a/project/scripts/cmdScaladocTests +++ b/project/scripts/cmdScaladocTests @@ -16,7 +16,7 @@ DOTTY_NONBOOTSTRAPPED_VERSION=$(eval $DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND | ta DOTTY_BOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyVersion)\"" DOTTY_BOOTSTRAPPED_VERSION=$(eval $DOTTY_BOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1) -SOURCE_LINKS_REPOSITORY="scala/scala3" +SOURCE_LINKS_REPOSITORY="${GITHUB_REPOSITORY:-scala/scala3}" SOURCE_LINKS_VERSION="${GITHUB_SHA:-$DOTTY_BOOTSTRAPPED_VERSION}" "$SBT" "scaladoc/generateTestcasesDocumentation" > "$tmp" 2>&1 || echo "generated testcases project with sbt"