Trying to make testing bigger

forsyde · Aug 10, 2023 · d61a740 · d61a740
1 parent 6fee756
commit d61a740
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 7 deletions.
diff --git a/.github/workflows/test-case-studies.yml b/.github/workflows/test-case-studies.yml
@@ -12,11 +12,10 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  test-cases:
+  build-on-linux:
     strategy:
       matrix:
         jabba_jdk: [temurin@17, amazon-corretto@17, zulu@17, microsoft@17]
-        target: [x86_64-unknown-linux-musl]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -26,7 +25,26 @@ jobs:
       - name: Test cases
         run: |
           cd ${{ github.workspace }}
-          earthly +dist-all --jabba_jdk="${{ matrix.jabba_jdk }}" --targets="${{ matrix.target }}"
+          earthly +dist-all --jabba_jdk="${{ matrix.jabba_jdk }}" --targets="x86_64-pc-windows-gnu x86_64-unknown-linux-musl"
+      - name: Cache-out outputs
+        uses: actions/cache@v3
+        with:
+          path: ${{ github.workspace }}/dist
+          key: ${{ github.ref }}-dist
+  test-cases-linux:
+    strategy:
+      matrix:
+        jabba_jdk: [temurin@17, amazon-corretto@17, zulu@17, microsoft@17]
+        target: [x86_64-unknown-linux-musl]
+    runs-on: ubuntu-latest
+    needs: build-on-linux
+    steps:
+      - uses: actions/checkout@v3
+      - name: Cache-in outputs
+        uses: actions/cache@v3
+        with:
+          path: ${{ github.workspace }}/dist
+          key: ${{ github.ref }}-dist
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10' 
@@ -39,3 +57,25 @@ jobs:
           export PATH="$JAVA_HOME/bin:$PATH"
           python -m pip install robotframework
           python -m robot --exclude slow TestsBenchmark.robot
+  test-cases-win:
+    strategy:
+      matrix:
+        jabba_jdk: [temurin@17, amazon-corretto@17, zulu@17, microsoft@17]
+    runs-on: windows-latest
+    needs: build-on-linux
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10' 
+      - run: |
+          cd ${{ github.workspace }}
+          cp -r ${{ github.workspace }}/dist/x86_64-pc-windows-gnu/* .
+          [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+          Invoke-Expression (
+            Invoke-WebRequest https://github.com/Jabba-Team/jabba/raw/master/install.ps1 -UseBasicParsing
+          ).Content
+          jabba install ${{ matrix.jabba_jdk }}
+          jabba alias default ${{ matrix.jabba_jdk }}
+          python -m pip install robotframework
+          python -m robot --exclude slow TestsBenchmark.robot
diff --git a/Earthfile b/Earthfile
@@ -145,21 +145,21 @@ test-case-studies:
     BUILD +build-rust-linux-host --targets=${targets}
     FROM debian:latest
     RUN apt-get update
-    RUN apt-get install -y curl bash wget python3 python3-pip python3-venv
+    RUN apt-get install -y curl bash wget python3 python3-pip python3-venv pipx
     RUN curl -sL https://github.com/Jabba-Team/jabba/raw/main/install.sh | JABBA_COMMAND="install ${jabba_jdk} -o /jdk" bash
     ENV JAVA_HOME /jdk
     ENV PATH $JAVA_HOME/bin:$PATH
     ENV TEST_SLOW=${test_slow}
-    RUN python3 -m venv robotenv
-    RUN /robotenv/bin/python -m pip install robotframework
+    RUN pipx install robotframework
+    # RUN /robotenv/bin/python -m pip install robotframework
     FOR target IN ${targets}
         WORKDIR /${target}
         COPY --dir +build-scala-all/${target}/* .
         COPY --dir +build-rust-linux-host/${target}/* .
         COPY --dir examples_and_benchmarks .
         COPY *.py .
         COPY *.robot .
-        RUN /robotenv/bin/python -m robot --exclude slow TestsBenchmark.robot
+        RUN robot --exclude slow TestsBenchmark.robot
         SAVE ARTIFACT report.html AS LOCAL report.html
         SAVE ARTIFACT log.html AS LOCAL log.html
         SAVE ARTIFACT output.xml AS LOCAL output.xml