diff --git a/.github/PklProject b/.github/PklProject index 5e147736..92d13696 100644 --- a/.github/PklProject +++ b/.github/PklProject @@ -2,7 +2,7 @@ amends "pkl:Project" dependencies { ["pkl.impl.ghactions"] { - uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.3.5" + uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.5.0" } ["gha"] { uri = "package://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.2.0" diff --git a/.github/PklProject.deps.json b/.github/PklProject.deps.json index 1b39d6ec..457d181d 100644 --- a/.github/PklProject.deps.json +++ b/.github/PklProject.deps.json @@ -10,9 +10,9 @@ }, "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1": { "type": "remote", - "uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.3.5", + "uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.5.0", "checksums": { - "sha256": "2b26d02c3b244a28e7913457ba195cbf767a1d1079ab2ed469074c4da870de12" + "sha256": "2c1e0d9efcd65b3c3207bf535c325ebc0ec2ab169187b324c4bb70821cac0e51" } }, "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.deepToTyped@1": { diff --git a/.github/jobs/BuildNativeJob.pkl b/.github/jobs/BuildNativeJob.pkl index ce98185a..7ec44c77 100644 --- a/.github/jobs/BuildNativeJob.pkl +++ b/.github/jobs/BuildNativeJob.pkl @@ -12,7 +12,7 @@ project: String extraGradleArgs { when (os == "macOS" && arch == "amd64") { "-Dpkl.targetArch=\(module.arch)" - "-Dpkl.native--native-compiler-path=\(context.github.workspace)/.github/scripts/cc_macos_amd64.sh" + #""-Dpkl.native--native-compiler-path=${GITHUB_WORKSPACE}/.github/scripts/cc_macos_amd64.sh""# } when (musl) { "-Dpkl.musl=true" @@ -40,7 +40,7 @@ steps { new { name = "Fix git ownership" // language=bash - run = "git status || git config --system --add safe.directory $GITHUB_WORKSPACE" + run = #"git status || git config --system --add safe.directory "$GITHUB_WORKSPACE""# } } new { diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4faf88d2..8eb3f2b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -189,7 +189,7 @@ jobs: with: {} - name: gradle buildNative shell: bash - run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-cli:buildNative + run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 "-Dpkl.native--native-compiler-path=${GITHUB_WORKSPACE}/.github/scripts/cc_macos_amd64.sh" pkl-cli:buildNative - name: Upload executable artifacts uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5 with: @@ -226,7 +226,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative @@ -307,7 +307,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative @@ -497,7 +497,7 @@ jobs: with: {} - name: gradle buildNative shell: bash - run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-doc:buildNative + run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 "-Dpkl.native--native-compiler-path=${GITHUB_WORKSPACE}/.github/scripts/cc_macos_amd64.sh" pkl-doc:buildNative - name: Upload executable artifacts uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5 with: @@ -534,7 +534,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative @@ -615,7 +615,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b4985b58..fa745dd1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -187,7 +187,7 @@ jobs: with: {} - name: gradle buildNative shell: bash - run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-cli:buildNative + run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 "-Dpkl.native--native-compiler-path=${GITHUB_WORKSPACE}/.github/scripts/cc_macos_amd64.sh" pkl-cli:buildNative - name: Upload executable artifacts uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5 with: @@ -224,7 +224,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative @@ -305,7 +305,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative @@ -495,7 +495,7 @@ jobs: with: {} - name: gradle buildNative shell: bash - run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-doc:buildNative + run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 "-Dpkl.native--native-compiler-path=${GITHUB_WORKSPACE}/.github/scripts/cc_macos_amd64.sh" pkl-doc:buildNative - name: Upload executable artifacts uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5 with: @@ -532,7 +532,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative @@ -613,7 +613,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative @@ -904,9 +904,10 @@ jobs: - name: Trigger pkl-lang.org build env: GH_TOKEN: ${{ steps.app-token.outputs.token }} + SOURCE_RUN: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} run: |- gh workflow run \ --repo apple/pkl-lang.org \ --ref main \ - --field source_run="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --field source_run="${SOURCE_RUN}" \ main.yml diff --git a/.github/workflows/prb.yml b/.github/workflows/prb.yml index 4999d01e..8f62fd4c 100644 --- a/.github/workflows/prb.yml +++ b/.github/workflows/prb.yml @@ -96,7 +96,7 @@ jobs: with: {} - name: gradle buildNative shell: bash - run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-cli:buildNative + run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 "-Dpkl.native--native-compiler-path=${GITHUB_WORKSPACE}/.github/scripts/cc_macos_amd64.sh" pkl-cli:buildNative - name: Upload executable artifacts uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5 with: @@ -135,7 +135,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative @@ -219,7 +219,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative @@ -414,7 +414,7 @@ jobs: with: {} - name: gradle buildNative shell: bash - run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-doc:buildNative + run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 "-Dpkl.native--native-compiler-path=${GITHUB_WORKSPACE}/.github/scripts/cc_macos_amd64.sh" pkl-doc:buildNative - name: Upload executable artifacts uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5 with: @@ -453,7 +453,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative @@ -537,7 +537,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative diff --git a/.github/workflows/release-branch.yml b/.github/workflows/release-branch.yml index f72f5145..b5f2f220 100644 --- a/.github/workflows/release-branch.yml +++ b/.github/workflows/release-branch.yml @@ -187,7 +187,7 @@ jobs: with: {} - name: gradle buildNative shell: bash - run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-cli:buildNative + run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 "-Dpkl.native--native-compiler-path=${GITHUB_WORKSPACE}/.github/scripts/cc_macos_amd64.sh" pkl-cli:buildNative - name: Upload executable artifacts uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5 with: @@ -224,7 +224,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative @@ -305,7 +305,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-cli:buildNative @@ -495,7 +495,7 @@ jobs: with: {} - name: gradle buildNative shell: bash - run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-doc:buildNative + run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -Dpkl.targetArch=amd64 "-Dpkl.native--native-compiler-path=${GITHUB_WORKSPACE}/.github/scripts/cc_macos_amd64.sh" pkl-doc:buildNative - name: Upload executable artifacts uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5 with: @@ -532,7 +532,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative @@ -613,7 +613,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true pkl-doc:buildNative @@ -855,9 +855,10 @@ jobs: - name: Trigger pkl-lang.org build env: GH_TOKEN: ${{ steps.app-token.outputs.token }} + SOURCE_RUN: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} run: |- gh workflow run \ --repo apple/pkl-lang.org \ --ref main \ - --field source_run="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --field source_run="${SOURCE_RUN}" \ main.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 65b6067b..f3a3afa4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -187,7 +187,7 @@ jobs: with: {} - name: gradle buildNative shell: bash - run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-cli:buildNative + run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true -Dpkl.targetArch=amd64 "-Dpkl.native--native-compiler-path=${GITHUB_WORKSPACE}/.github/scripts/cc_macos_amd64.sh" pkl-cli:buildNative - name: Upload executable artifacts uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5 with: @@ -224,7 +224,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true pkl-cli:buildNative @@ -305,7 +305,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true pkl-cli:buildNative @@ -495,7 +495,7 @@ jobs: with: {} - name: gradle buildNative shell: bash - run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true -Dpkl.targetArch=amd64 -Dpkl.native--native-compiler-path=${{ github.workspace }}/.github/scripts/cc_macos_amd64.sh pkl-doc:buildNative + run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true -Dpkl.targetArch=amd64 "-Dpkl.native--native-compiler-path=${GITHUB_WORKSPACE}/.github/scripts/cc_macos_amd64.sh" pkl-doc:buildNative - name: Upload executable artifacts uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5 with: @@ -532,7 +532,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true pkl-doc:buildNative @@ -613,7 +613,7 @@ jobs: - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5 with: {} - name: Fix git ownership - run: git status || git config --system --add safe.directory $GITHUB_WORKSPACE + run: git status || git config --system --add safe.directory "$GITHUB_WORKSPACE" - name: gradle buildNative shell: bash run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true -DreleaseBuild=true pkl-doc:buildNative @@ -931,9 +931,10 @@ jobs: - name: Trigger pkl-lang.org build env: GH_TOKEN: ${{ steps.app-token.outputs.token }} + SOURCE_RUN: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} run: |- gh workflow run \ --repo apple/pkl-lang.org \ --ref main \ - --field source_run="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --field source_run="${SOURCE_RUN}" \ main.yml