Fix commands for extracting Maven properties

aehrc · Dec 1, 2023 · 4e9d323 · 4e9d323
1 parent 162dd1e
commit 4e9d323
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -156,10 +156,10 @@ jobs:
           restore-keys: r-packages-${{ runner.os }}-
       - name: Extract Spark version
         working-directory: lib/R
-        run: echo "SPARK_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${pathling.Rapi.sparkVersion}' --non-recursive exec:exec)" >> $GITHUB_ENV
+        run: echo "SPARK_VERSION=$(awk -F'[<>]' '/<pathling.Rapi.sparkVersion>/ {print $3}' pom.xml)" >> $GITHUB_ENV
       - name: Extract Hadoop version
         working-directory: lib/R
-        run: echo "HADOOP_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${pathling.Rapi.hadoopVersion}' --non-recursive exec:exec)" >> $GITHUB_ENV
+        run: echo "HADOOP_VERSION=$(awk -F'[<>]' '/<pathling.Rapi.hadoopVersion>/ {print $3}' pom.xml)" >> $GITHUB_ENV
       - name: Cache Spark
         id: cache-spark
         uses: actions/cache@v2

diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml
@@ -28,6 +28,27 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
+      - name: Extract Spark version
+        working-directory: lib/R
+        run: echo "SPARK_VERSION=$(awk -F'[<>]' '/<pathling.Rapi.sparkVersion>/ {print $3}' pom.xml)" >> $GITHUB_ENV
+      - name: Extract Hadoop version
+        working-directory: lib/R
+        run: echo "HADOOP_VERSION=$(awk -F'[<>]' '/<pathling.Rapi.hadoopVersion>/ {print $3}' pom.xml)" >> $GITHUB_ENV
+      - name: Cache Spark
+        id: cache-spark
+        uses: actions/cache@v2
+        with:
+          path: /home/runner/spark/spark-${{ env.SPARK_VERSION }}-bin-hadoop${{ env.HADOOP_VERSION }}
+          key: spark-${{ env.SPARK_VERSION }}-bin-hadoop${{ env.HADOOP_VERSION }}
+      - name: Install Pandoc
+        uses: r-lib/actions/setup-pandoc@v2
+      - name: Install R
+        uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: "4.1.3"
+          use-public-rspm: true
+      - name: Install texlive-latex-base
+        run: sudo apt-get install -y texlive-latex-base texlive-fonts-extra
       - name: Run the verify goal with Maven
         run: >-
           mvn --batch-mode verify

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -609,10 +609,10 @@ jobs:
           restore-keys: r-packages-${{ runner.os }}-
       - name: Extract Spark version
         working-directory: lib/R
-        run: echo "SPARK_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${pathling.Rapi.sparkVersion}' --non-recursive exec:exec)" >> $GITHUB_ENV
+        run: echo "SPARK_VERSION=$(awk -F'[<>]' '/<pathling.Rapi.sparkVersion>/ {print $3}' pom.xml)" >> $GITHUB_ENV
       - name: Extract Hadoop version
         working-directory: lib/R
-        run: echo "HADOOP_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${pathling.Rapi.hadoopVersion}' --non-recursive exec:exec)" >> $GITHUB_ENV
+        run: echo "HADOOP_VERSION=$(awk -F'[<>]' '/<pathling.Rapi.hadoopVersion>/ {print $3}' pom.xml)" >> $GITHUB_ENV
       - name: Cache Spark
         id: cache-spark
         uses: actions/cache@v2
@@ -677,10 +677,10 @@ jobs:
             ${{ runner.os }}-maven-
       - name: Extract Spark version
         working-directory: lib/R
-        run: echo "SPARK_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${pathling.Rapi.sparkVersion}' --non-recursive exec:exec)" >> $GITHUB_ENV
+        run: echo "SPARK_VERSION=$(awk -F'[<>]' '/<pathling.Rapi.sparkVersion>/ {print $3}' pom.xml)" >> $GITHUB_ENV
       - name: Extract Hadoop version
         working-directory: lib/R
-        run: echo "HADOOP_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${pathling.Rapi.hadoopVersion}' --non-recursive exec:exec)" >> $GITHUB_ENV
+        run: echo "HADOOP_VERSION=$(awk -F'[<>]' '/<pathling.Rapi.hadoopVersion>/ {print $3}' pom.xml)" >> $GITHUB_ENV
       - name: Cache Spark
         id: cache-spark
         uses: actions/cache@v2