Move env vars to common.sh

Author: qinsoon

.github/scripts/ci-style.sh

@@ -1,17 +1,18 @@
-project_root=$(dirname "$0")/../..
 set -xe
 
+. $(dirname "$0")/common.sh
+
 export RUSTFLAGS="-D warnings"
 
-pushd $project_root/mmtk
+pushd $BINDGING_PATH/mmtk
 cargo clippy
 cargo clippy --release
 
 cargo fmt -- --check
 popd
 
-find $project_root/openjdk \
-    $project_root/mmtk \
+find $BINDGING_PATH/openjdk \
+    $BINDGING_PATH/mmtk \
     -name '*.hpp' \
     -o -name '*.cpp' \
     -o -name '*.rs' \

.github/scripts/ci-test-assertions.sh

@@ -1,5 +1,7 @@
 set -xe
 
+. $(dirname "$0")/common.sh
+
 unset JAVA_TOOL_OPTIONS
 
 # To OpenJDK folder

.github/scripts/ci-test-global-alloc-bit.sh

@@ -1,5 +1,7 @@
 set -xe
 
+. $(dirname "$0")/common.sh
+
 unset JAVA_TOOL_OPTIONS
 
 # To OpenJDK folder

.github/scripts/ci-test-normal.sh

@@ -1,5 +1,7 @@
 set -xe
 
+. $(dirname "$0")/common.sh
+
 unset JAVA_TOOL_OPTIONS
 
 # To OpenJDK folder

.github/scripts/common.sh

@@ -1 +1,5 @@
+BINDING_PATH=$(realpath $(dirname "$0"))/../../
+OPENJDK_PATH=$BINDING_PATH/repos/openjdk
+DACAPO_PATH=$OPENJDK_PATH/dacapo
+
 RUSTUP_TOOLCHAIN=`cat $BINDING_PATH/mmtk/rust-toolchain`

.github/workflows/ci-assert.yml

@@ -0,0 +1,20 @@
+name: Dacapo Tests
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test-assertions:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Environments
+        run: |
+            ./.github/scripts/ci-checkout.sh
+            ./.github/scripts/ci-setup.sh
+
+      # Run the tests with assertions
+      - name: Dacapo Test (with extreme_assertions)
+        run: ./.github/scripts/ci-test-assertions.sh

.github/workflows/ci.yml

@@ -9,24 +9,19 @@ jobs:
   test:
     runs-on: ubuntu-18.04
     steps:
-      - name: Setup env vars for paths
-        run: |
-          echo "OPENJDK_PATH=$PWD/openjdk" >> $GITHUB_ENV
-          echo "BINDING_PATH=$PWD/mmtk-openjdk" >> $GITHUB_ENV
-          echo "DACAPO_PATH=$PWD/dacapo" >> $GITHUB_ENV
       - uses: actions/checkout@v2
-        with:
-          path: ${{ env.BINDING_PATH }}
       - name: Setup environments
-        working-directory: ${{ env.BINDING_PATH }}
-        run: |
-          .github/scripts/ci-checkout.sh
-          .github/scripts/ci-setup.sh
-      - name: Run Tests
-        working-directory: ${{ env.BINDING_PATH }}
         run: |
-          .github/scripts/ci-test.sh
+          ./.github/scripts/ci-checkout.sh
+          ./.github/scripts/ci-setup.sh
+
+      # Run the tests
+      - name: Dacapo Tests
+        run: ./.github/scripts/ci-test-normal.sh
+      - name: DaCapo Tests for Global Allocation Bit
+        run: ./.github/scripts/ci-test-global-alloc-bit.sh
+
+      # Style check
       - name: Style check
-        working-directory: ${{ env.BINDING_PATH }}
         run: |
-          .github/scripts/ci-style.sh
+          ./.github/scripts/ci-style.sh