refactor: add macos build and test github actions and refine windows …

…and ubuntu github actions.
kcl-lang · Aug 1, 2022 · 58360f4 · 58360f4
1 parent 5bc87cf
commit 58360f4
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 15 deletions.
diff --git a/.github/workflows/macos_test.yaml b/.github/workflows/macos_test.yaml
@@ -0,0 +1,54 @@
+name: build-and-test-macos
+on: ["push", "pull_request"]
+jobs:
+  build-and-test:
+    # Ref: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
+    runs-on: macos-11
+    steps:
+      - name: Git checkout
+        uses: actions/checkout@v2
+        with:
+         submodules: 'true'
+
+      - run: clang --version
+      - run: cargo --version
+      - run: rustc --print sysroot
+
+      - name: Build KCLVM
+        run: make build
+        shell: bash
+      - name: Grammar test
+        run: |
+          brew install coreutils
+          chmod +x ./internal/kclvm_py/scripts/test_grammar.sh
+          ./internal/kclvm_py/scripts/test_grammar.sh
+        shell: bash
+      - name: Internal python unit test
+        run: |
+          chmod +x ./internal/kclvm_py/scripts/test_unit.sh
+          ./internal/kclvm_py/scripts/test_unit.sh
+        shell: bash
+      - name: Delete rust cargo
+        run: rm -rf /root/.cargo/bin
+        shell: bash
+      - name: Install LLVM 12
+        run: brew install llvm@12
+        shell: bash
+      - name: Install rust nightly toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: 1.61
+          override: true
+          components: clippy, rustfmt
+      - name: Rust grammar test
+        working-directory: ./kclvm
+        run: export PATH=$PATH:$PWD/../_build/dist/Darwin/kclvm/bin:/usr/local/opt/llvm@12/bin && make install-rustc-wasm && make && make test-grammar
+        shell: bash
+      - name: Rust runtime test
+        working-directory: ./kclvm
+        run: export PATH=$PATH:$PWD/../_build/dist/Darwin/kclvm/bin:/usr/local/opt/llvm@12/bin && make install-rustc-wasm && make && make test-runtime
+        shell: bash
+      - name: Rust unit test
+        working-directory: ./kclvm
+        run: export PATH=$PATH:$PWD/../_build/dist/Darwin/kclvm/bin:/usr/local/opt/llvm@12/bin && make install-rustc-wasm && make && make codecov-lcov
+        shell: bash
diff --git a/.github/workflows/github-actions.yaml → .github/workflows/ubuntu_test.yaml b/.github/workflows/github-actions.yaml → .github/workflows/ubuntu_test.yaml
@@ -1,7 +1,7 @@
-name: KCLVM-actions
+name: build-and-test-ubuntu
 on: ["push", "pull_request"]
 jobs:
-  test-unit:
+  build-and-test:
     name: Test
     runs-on: ubuntu-latest
     container: 
@@ -17,7 +17,7 @@ jobs:
       - name: Grammar test
         run: |
           chmod +x ./internal/kclvm_py/scripts/test_grammar.sh
-          topdir=$(realpath $(dirname $0)) ./internal/kclvm_py/scripts/test_grammar.sh
+          ./internal/kclvm_py/scripts/test_grammar.sh
         shell: bash
       - name: Internal python unit test
         run: |

diff --git a/.github/workflows/main_windows.yml → .github/workflows/windows_test.yaml b/.github/workflows/main_windows.yml → .github/workflows/windows_test.yaml
@@ -1,5 +1,5 @@
 name: build-and-test-windows
-on: push
+on: ["push", "pull_request"]
 jobs:
   build-and-test:
     runs-on: windows-2019
@@ -15,8 +15,6 @@ jobs:
       - run: clang --version
       - run: cargo --version
 
-      - run: rustc --print sysroot
-
       - run: Rename-Item "C:/Program Files/LLVM" "C:/Program Files/LLVM-old"
 
       # Install LLVM-12

diff --git a/internal/kclvm_py/scripts/build-cpython.sh b/internal/kclvm_py/scripts/build-cpython.sh
@@ -35,11 +35,9 @@ do
                 sslpath=$(brew --prefix openssl@1.1)
             fi
 
-            if [ x"$(uname -m)" == x"arm64" ]; then
-                py_ver_major="3"
-                py_ver_minor="9"
-                py_ver_micro="12"
-            fi
+            py_ver_major="3"
+            py_ver_minor="9"
+            py_ver_micro="12"
 
             config_envs="LANG=C.UTF-8"
             config_options="--enable-optimizations --with-openssl=$sslpath --with-ssl-default-suites=python"

diff --git a/internal/kclvm_py/scripts/test_grammar.sh b/internal/kclvm_py/scripts/test_grammar.sh
@@ -1,12 +1,20 @@
 #!/usr/bin/env bash
 
+# Environment
+if [ -f "/etc/os-release" ]; then
+    source /etc/os-release
+    os=$ID
+else
+    os=$(uname)
+fi
 topdir=$(realpath $(dirname $0)/../../../)
-kclvm_install_dir="$topdir/_build/dist/$os/kclvm"
 kclvm_source_dir="$topdir"
 
-echo PATH=$PATH:$kclvm_source_dir/_build/dist/ubuntu/kclvm/bin >> ~/.bash_profile
+echo PATH=$PATH:$kclvm_source_dir/_build/dist/$os/kclvm/bin >> ~/.bash_profile
 source ~/.bash_profile
 
+export PATH=$PATH:$topdir/_build/dist/$os/kclvm/bin
+
 # Grammar test
 cd $kclvm_source_dir/test/grammar
 kclvm -m pytest -v -n 10
diff --git a/internal/kclvm_py/scripts/test_unit.sh b/internal/kclvm_py/scripts/test_unit.sh
@@ -1,12 +1,20 @@
 #!/usr/bin/env bash
 
+# Environment
+if [ -f "/etc/os-release" ]; then
+    source /etc/os-release
+    os=$ID
+else
+    os=$(uname)
+fi
 topdir=$(realpath $(dirname $0)/../../../)
-kclvm_install_dir="$topdir/_build/dist/$os/kclvm"
 kclvm_source_dir="$topdir"
 
-echo PATH=$PATH:$kclvm_source_dir/_build/dist/ubuntu/kclvm/bin >> ~/.bash_profile
+echo PATH=$PATH:$kclvm_source_dir/_build/dist/$os/kclvm/bin >> ~/.bash_profile
 source ~/.bash_profile
 
+export PATH=$PATH:$topdir/_build/dist/$os/kclvm/bin
+
 # Install the dependency
 kclvm -m pip install nose==1.3.7