Fixes GH actions

johnedquinn · Sep 23, 2024 · 8a4a150 · 8a4a150
1 parent f094ed3
commit 8a4a150
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 8 deletions.
diff --git a/.github/workflows/conformance-report.yml b/.github/workflows/conformance-report.yml
@@ -17,6 +17,8 @@ jobs:
     steps:
       - name: Print
         run: |
+          mkdir -p $GITHUB_WORKSPACE/artifact
+          cp -r $GITHUB_WORKSPACE/$PATH_TO_TEST_RUNNER/$CONFORMANCE_REPORT_RELATIVE_PATH $GITHUB_WORKSPACE/artifact/$CONFORMANCE_REPORT_RELATIVE_PATH
           T="CROSS-ENGINE-REPORT"
           BF="$GITHUB_WORKSPACE/test/partiql-tests-runner/src/main/resources/config/legacy/$CONFORMANCE_REPORT_NAME"
           BL="LEGACY"
@@ -27,6 +29,16 @@ jobs:
           O="$COMPARISON_REPORT_NAME"
           ARGS="-t $T -bf $BF -bl $BL -bt $BT -tf $TF -tl $TL -tt $TT -o $O"
           echo $ARGS
+          T="CROSS-COMMIT-REPORT"
+          BF="$GITHUB_WORKSPACE/artifact/$CONFORMANCE_REPORT_RELATIVE_PATH/eval/$CONFORMANCE_REPORT_NAME"
+          BL="EVAL"
+          BT="${{ github.event.pull_request.base.sha }}"
+          TF="$CONFORMANCE_REPORT_RELATIVE_PATH/eval/$CONFORMANCE_REPORT_NAME"
+          TL="EVAL"
+          TT="$GITHUB_SHA"
+          O="$COMPARISON_REPORT_NAME"
+          ARGS="-t $T -bf $BF -bl $BL -bt $BT -tf $TF -tl $TL -tt $TT -o $O"
+          echo $ARGS
   conformance-report:
     name: Create conformance report for `push` and `pull_request` events
     runs-on: ubuntu-latest
@@ -118,14 +130,18 @@ jobs:
         continue-on-error: true
         run: |
           T="CROSS-ENGINE-REPORT"
-          BF="$GITHUB_WORKSPACE/test/partiql-tests-runner/src/main/resources/config/legacy/$CONFORMANCE_REPORT_NAME"
+          BF="$GITHUB_WORKSPACE/$PATH_TO_TEST_RUNNER/src/main/resources/config/legacy/$CONFORMANCE_REPORT_NAME"
           BL="LEGACY"
           BT="$LEGACY_VERSION"
-          TF="$CONFORMANCE_REPORT_RELATIVE_PATH/eval/CONFORMANCE_REPORT_NAME"
+          TF="$GITHUB_WORKSPACE/$PATH_TO_TEST_RUNNER/$CONFORMANCE_REPORT_RELATIVE_PATH/eval/$CONFORMANCE_REPORT_NAME"
           TL="EVAL"
           TT="$GITHUB_SHA"
           O="$COMPARISON_REPORT_NAME"
           ARGS="-t $T -bf $BF -bl $BL -bt $BT -tf $TF -tl $TL -tt $TT -o $O"
+          echo "Comment CROSS-ENGINE"
+          pwd
+          ls
+          echo $ARGS
           gradle :test:partiql-tests-runner:run --args="$ARGS"
       - name: "Artifact CROSS-COMMIT Report (appends to comparison_report.md)"
         continue-on-error: true
@@ -134,11 +150,15 @@ jobs:
           BF="$GITHUB_WORKSPACE/artifact/$CONFORMANCE_REPORT_RELATIVE_PATH/eval/$CONFORMANCE_REPORT_NAME"
           BL="EVAL"
           BT="${{ github.event.pull_request.base.sha }}"
-          TF="$CONFORMANCE_REPORT_RELATIVE_PATH/eval/$CONFORMANCE_REPORT_NAME"
+          TF="$GITHUB_WORKSPACE/$PATH_TO_TEST_RUNNER/$CONFORMANCE_REPORT_RELATIVE_PATH/eval/$CONFORMANCE_REPORT_NAME"
           TL="EVAL"
           TT="$GITHUB_SHA"
           O="$COMPARISON_REPORT_NAME"
           ARGS="-t $T -bf $BF -bl $BL -bt $BT -tf $TF -tl $TL -tt $TT -o $O"
+          echo "Comment CROSS-COMMIT"
+          pwd
+          ls
+          echo $ARGS
           gradle :test:partiql-tests-runner:run --args="$ARGS"
       # Print conformance report to GitHub actions workflow summary page
       - name: Print markdown in run
@@ -153,15 +173,19 @@ jobs:
         continue-on-error: true
         run: |
           T="CROSS-ENGINE-REPORT"
-          BF="$GITHUB_WORKSPACE/test/partiql-tests-runner/src/main/resources/config/legacy/$CONFORMANCE_REPORT_NAME"
+          BF="$GITHUB_WORKSPACE/$PATH_TO_TEST_RUNNER/src/main/resources/config/legacy/$CONFORMANCE_REPORT_NAME"
           BL="LEGACY"
           BT="$LEGACY_VERSION"
-          TF="$CONFORMANCE_REPORT_RELATIVE_PATH/eval/CONFORMANCE_REPORT_NAME"
+          TF="$GITHUB_WORKSPACE/$PATH_TO_TEST_RUNNER/$CONFORMANCE_REPORT_RELATIVE_PATH/eval/$CONFORMANCE_REPORT_NAME"
           TL="EVAL"
           TT="$GITHUB_SHA"
           O="$COMPARISON_REPORT_NAME_WITH_LIMIT"
           L="$COMMENT_SIZE_LIMIT"
           ARGS="-t $T -bf $BF -bl $BL -bt $BT -tf $TF -tl $TL -tt $TT -o $O -l $L"
+          echo "Comment CROSS-ENGINE"
+          pwd
+          ls
+          echo $ARGS
           gradle :test:partiql-tests-runner:run --args="$ARGS"
       - name: "Comment CROSS-COMMIT Report (appends to comparison_report_limited.md)"
         continue-on-error: true
@@ -170,12 +194,16 @@ jobs:
           BF="$GITHUB_WORKSPACE/artifact/$CONFORMANCE_REPORT_RELATIVE_PATH/eval/$CONFORMANCE_REPORT_NAME"
           BL="EVAL"
           BT="${{ github.event.pull_request.base.sha }}"
-          TF="$CONFORMANCE_REPORT_RELATIVE_PATH/eval/$CONFORMANCE_REPORT_NAME"
+          TF="$GITHUB_WORKSPACE/$PATH_TO_TEST_RUNNER/$CONFORMANCE_REPORT_RELATIVE_PATH/eval/$CONFORMANCE_REPORT_NAME"
           TL="EVAL"
           TT="$GITHUB_SHA"
           O="$COMPARISON_REPORT_NAME_WITH_LIMIT"
           L="$COMMENT_SIZE_LIMIT"
           ARGS="-t $T -bf $BF -bl $BL -bt $BT -tf $TF -tl $TL -tt $TT -o $O -l $L"
+          echo "Comment CROSS-COMMIT"
+          pwd
+          ls
+          echo $ARGS
           gradle :test:partiql-tests-runner:run --args="$ARGS"
       # Find comment w/ conformance comparison if previous comment published
       - name: Find Comment

diff --git a/buildSrc/src/main/kotlin/partiql.versions.kt b/buildSrc/src/main/kotlin/partiql.versions.kt
@@ -48,7 +48,6 @@ object Versions {
     const val pig = "0.6.3"
     const val kotlinxCoroutines = "1.8.1"
     const val kotlinxCoroutinesJdk8 = "1.8.1"
-    const val shadow = "8.1.1"
     const val ktlint = "0.42.1" // we're on an old version of ktlint. TODO upgrade https://github.com/partiql/partiql-lang-kotlin/issues/1418
 
     // Testing
@@ -124,6 +123,5 @@ object Plugins {
     const val dokka = "org.jetbrains.dokka"
     const val jmh = "me.champeau.jmh"
     const val library = "org.gradle.java-library"
-    const val shadow = "com.github.johnrengelman.shadow"
     const val testFixtures = "org.gradle.java-test-fixtures"
 }