ci: update and cleanup the ci related code (#19541)

vlang · Oct 10, 2023 · 3e50ba0 · 3e50ba0
1 parent c4ee940
commit 3e50ba0
Show file tree

Hide file tree

Showing 7 changed files with 186 additions and 191 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -1,6 +1,6 @@
 env:
   LANG: en_US.UTF-8
-  
+
 freebsd_instance:
   image_family: freebsd-13-0
 

diff --git a/.github/workflows/code_ci.yml b/.github/workflows/code_ci.yml
@@ -0,0 +1,33 @@
+name: Code CI
+
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+      - '**.yml'
+      - '!**/code_ci.yml'
+      - '!**/linux_ci.yml'
+      - '!**/macos_ci.yml'
+      - '!**/windows_ci.yml'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+      - '**.yml'
+      - '!**/code_ci.yml'
+      - '!**/linux_ci.yml'
+      - '!**/macos_ci.yml'
+      - '!**/windows_ci.yml'
+
+concurrency:
+  group: code-ci-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+jobs:
+  linux:
+    uses: ./.github/workflows/linux_ci.yml
+
+  macos:
+    uses: ./.github/workflows/macos_ci.yml
+
+  windows:
+    uses: ./.github/workflows/windows_ci.yml
diff --git a/.github/workflows/linux_ci.yml b/.github/workflows/linux_ci.yml
@@ -1,21 +1,10 @@
-name: Code CI Linux
+name: CI Linux
 
 on:
-  push:
-    paths-ignore:
-      - "**.md"
-      - "**.yml"
-  pull_request:
-    paths-ignore:
-      - "**.md"
-      - "**.yml"
-
-concurrency:
-  group: build-ci-linux-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
+  workflow_call:
 
 jobs:
-  ubuntu-tcc:
+  tcc:
     runs-on: ubuntu-20.04
     if: github.event_name != 'push' || github.event.ref == 'refs/heads/master' || github.event.repository.full_name != 'vlang/v'
     timeout-minutes: 121
@@ -28,7 +17,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install --quiet -y libssl-dev sqlite3 libsqlite3-dev valgrind
           sudo apt-get install --quiet -y libfreetype6-dev  libxi-dev libxcursor-dev libgl-dev
-          ## The following is needed for examples/wkhtmltopdf.v
+          # The following is needed for examples/wkhtmltopdf.v
           wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb
           sudo apt-get install --quiet -y xfonts-75dpi xfonts-base
           sudo apt-get install --quiet -y expect
@@ -46,7 +35,7 @@ jobs:
         run: |
           thirdparty/tcc/tcc.exe -version
           ./v -cg -o v cmd/v # Make sure vtcc can build itself twice
-      #        ./v test-all
+          # ./v test-all
       - name: v self compilation
         run: ./v -o v2 cmd/v && ./v2 -o v3 cmd/v && ./v3 -o v4 cmd/v
       - name: v self compilation with -skip-unused
@@ -103,7 +92,7 @@ jobs:
       - name: Test readline
         run: ./v test examples/readline/
 
-  ubuntu-tcc-boehm-gc:
+  tcc-boehm-gc:
     runs-on: ubuntu-20.04
     if: github.event_name != 'push' || github.event.ref == 'refs/heads/master' || github.event.repository.full_name != 'vlang/v'
     timeout-minutes: 121
@@ -117,7 +106,7 @@ jobs:
           sudo apt-get install --quiet -y libssl-dev sqlite3 libsqlite3-dev valgrind
           sudo apt-get install --quiet -y libfreetype6-dev  libxi-dev libxcursor-dev libgl-dev
           sudo apt-get install --quiet -y libgc-dev
-          ## The following is needed for examples/wkhtmltopdf.v
+          # The following is needed for examples/wkhtmltopdf.v
           wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb
           sudo apt-get install --quiet -y xfonts-75dpi xfonts-base
           sudo dpkg -i wkhtmltox_0.12.6-1.focal_amd64.deb
@@ -160,7 +149,7 @@ jobs:
           ./testcase_leak 2>leaks.txt
           [ "$(stat -c %s leaks.txt)" = "0" ]
 
-  ubuntu:
+  gcc:
     runs-on: ubuntu-20.04
     if: github.event_name != 'push' || github.event.ref == 'refs/heads/master' || github.event.repository.full_name != 'vlang/v'
     timeout-minutes: 121
@@ -181,14 +170,14 @@ jobs:
           ./v -o v3 cmd/v -cflags "-fsanitize=undefined -fno-sanitize=alignment"
           UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1 ./v2 -o v.c cmd/v
           UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1 ./v3 -o v.c cmd/v
-      #    - name: Test V
-      #      run: ./v test-all
-      #    - name: Test v binaries
-      #      run: ./v build-vbinaries
-      ##    - name: Test v->js
-      ##      run: ./v -o hi.js examples/hello_v_js.v && node hi.js
-      #    - name: Build Vorum
-      #      run: git clone --depth 1 https://github.com/vlang/vorum && cd vorum && ../v . && cd ..
+      # - name: Test V
+      #   run: ./v test-all
+      # - name: Test v binaries
+      #   run: ./v build-vbinaries
+      # - name: Test v->js
+      #   run: ./v -o hi.js examples/hello_v_js.v && node hi.js
+      # - name: Build Vorum
+      #   run: git clone --depth 1 https://github.com/vlang/vorum && cd vorum && ../v . && cd ..
       - name: Build vpm
         run: ./v install markdown && git clone --depth 1 https://github.com/vlang/vpm && cd vpm && ../v . || ../v cmd/vpm && cd ..
       - name: Freestanding
@@ -255,21 +244,20 @@ jobs:
           echo "Building it..."
           ../../vprod -backend native -o 1m 1m.v
           echo "Running it..."
+          # ./1m
           ls
       - name: compile vdoctor.v with -skip-unused and -prod
         run: ./v -showcc -skip-unused -cc gcc -prod cmd/tools/vdoctor.v
       - name: compile vup.v with -skip-unused and -prod
         run: ./v -showcc -skip-unused -cc gcc -prod cmd/tools/vup.v
 
+      # - run: cd examples/native && ../../v -native hello_world.v && ./hello_world
+      # - name: Coveralls GitHub Action
+      #   uses: coverallsapp/github-action@v1.0.1
+      #   with:
+      #     github-token: ${{ secrets.GITHUB_TOKEN }}
 
-  #        ./1m
-  # run: echo "TODO" #cd examples/native && ../../v -native hello_world.v && ./hello_world
-  #    - name: Coveralls GitHub Action
-  #      uses: coverallsapp/github-action@v1.0.1
-  #      with:
-  #        github-token: ${{ secrets.GITHUB_TOKEN }}
-
-  ubuntu-clang:
+  clang:
     runs-on: ubuntu-20.04
     if: github.event_name != 'push' || github.event.ref == 'refs/heads/master' || github.event.repository.full_name != 'vlang/v'
     timeout-minutes: 121
@@ -359,40 +347,38 @@ jobs:
           echo "Running it..."
           ls
 
+  # autofree-selfcompile:
+  #   runs-on: ubuntu-20.04
+  #   if: github.event_name != 'push' || github.event.ref == 'refs/heads/master' || github.event.repository.full_name != 'vlang/v'
+  #   timeout-minutes: 121
+  #   env:
+  #     VFLAGS: -cc gcc
+  #   steps:
+  #   - uses: actions/checkout@v3
+  #   - name: Build V
+  #     run: make -j4
+  #   - name: V self compilation with -autofree
+  #     run: ./v -o v2 -autofree cmd/v && ./v2 -o v3 -autofree cmd/v && ./v3 -o v4 -autofree cmd/v
 
-#  ubuntu-autofree-selfcompile:
-#    runs-on: ubuntu-20.04
-#    if: github.event_name != 'push' || github.event.ref == 'refs/heads/master' || github.event.repository.full_name != 'vlang/v'
-#    timeout-minutes: 121
-#    env:
-#      VFLAGS: -cc gcc
-#    steps:
-#    - uses: actions/checkout@v3
-#    - name: Build V
-#      run: make -j4
-#    - name: V self compilation with -autofree
-#      run: ./v -o v2 -autofree cmd/v && ./v2 -o v3 -autofree cmd/v && ./v3 -o v4 -autofree cmd/v
-
-
-#   ubuntu-musl:
-#     runs-on: ubuntu-20.04
-#    if: github.event_name != 'push' || github.event.ref == 'refs/heads/master' || github.event.repository.full_name != 'vlang/v'
-#     timeout-minutes: 121
-#     env:
-#       VFLAGS: -cc musl-gcc
-#       V_CI_MUSL: 1
-#     steps:
-#     - uses: actions/checkout@v3
-#     - name: Install dependencies
-#       run: |
-#          sudo apt-get install --quiet -y musl musl-tools libssl-dev sqlite3 libsqlite3-dev valgrind
-#     - name: Build v
-#       run: echo $VFLAGS && make -j4 && ./v -cg -o v cmd/v
-# #    - name: Test v binaries
-# #      run: ./v build-vbinaries
-# ##    - name: Test v->js
-# ##      run: ./v -o hi.js examples/hello_v_js.v && node hi.js
-#     - name: quick debug
-#       run: ./v -stats vlib/strconv/format_test.v
-#     - name: Self tests
-#       run: ./v test-self
+  # musl:
+  #   runs-on: ubuntu-20.04
+  #   if: github.event_name != 'push' || github.event.ref == 'refs/heads/master' || github.event.repository.full_name != 'vlang/v'
+  #   timeout-minutes: 121
+  #   env:
+  #     VFLAGS: -cc musl-gcc
+  #     V_CI_MUSL: 1
+  #   steps:
+  #   - uses: actions/checkout@v3
+  #   - name: Install dependencies
+  #     run: |
+  #        sudo apt-get install --quiet -y musl musl-tools libssl-dev sqlite3 libsqlite3-dev valgrind
+  #   - name: Build v
+  #     run: echo $VFLAGS && make -j4 && ./v -cg -o v cmd/v
+  #   # - name: Test v binaries
+  #   #   run: ./v build-vbinaries
+  #   # - name: Test v->js
+  #   #   run: ./v -o hi.js examples/hello_v_js.v && node hi.js
+  #   - name: quick debug
+  #     run: ./v -stats vlib/strconv/format_test.v
+  #   - name: Self tests
+  #     run: ./v test-self
diff --git a/.github/workflows/macos_ci.yml b/.github/workflows/macos_ci.yml
@@ -1,21 +1,10 @@
-name: Code CI macos
+name: CI macOS
 
 on:
-  push:
-    paths-ignore:
-      - "**.md"
-      - "**.yml"
-  pull_request:
-    paths-ignore:
-      - "**.md"
-      - "**.yml"
-
-concurrency:
-  group: build-ci-macos-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
+  workflow_call:
 
 jobs:
-  macos:
+  clang:
     runs-on: macOS-12
     if: github.event_name != 'push' || github.event.ref == 'refs/heads/master' || github.event.repository.full_name != 'vlang/v'
     timeout-minutes: 121
@@ -42,18 +31,18 @@ jobs:
         run: ./v symlink
       - name: Build vpm
         run: ./v install markdown && git clone --depth 1 https://github.com/vlang/vpm && cd vpm && ../v . || ../v cmd/vpm && cd ..
-      #    - name: Set up pg database
-      #      run: |
-      #        pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start
-      #        psql -d postgres -c 'select rolname from pg_roles'
-      #        psql -d postgres -c 'create database customerdb;'
-      #        psql -d customerdb -f examples/database/pg/mydb.sql
-      #    - name: Test v->c
-      #      run: ./v test-all
-      #    - name: Test v binaries
-      #      run: ./v build-vbinaries
-      ##    - name: Test v->js
-      ##      run: ./v -o hi.js examples/hello_v_js.v && node hi.js
+      # - name: Set up pg database
+      #   run: |
+      #     pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start
+      #     psql -d postgres -c 'select rolname from pg_roles'
+      #     psql -d postgres -c 'create database customerdb;'
+      #     psql -d customerdb -f examples/database/pg/mydb.sql
+      # - name: Test v->c
+      #   run: ./v test-all
+      # - name: Test v binaries
+      #   run: ./v build-vbinaries
+      # - name: Test v->js
+      #   run: ./v -o hi.js examples/hello_v_js.v && node hi.js
       - name: Verify `v test` works
         run: |
           echo $VFLAGS
@@ -84,14 +73,14 @@ jobs:
           ../v -autofree .
           ../v -prod .
           cd ..
-#      - name: Test c2v
-#        run: |
-#          git clone --depth 1 https://github.com/vlang/c2v
-#          cd c2v && ../v -o c2v .
-#          ../v .
-#          ../v run tests/run_tests.vsh
-#          ../v -experimental -w c2v_test.v
-#          cd ..
+      # - name: Test c2v
+      #   run: |
+      #     git clone --depth 1 https://github.com/vlang/c2v
+      #     cd c2v && ../v -o c2v .
+      #     ../v .
+      #     ../v run tests/run_tests.vsh
+      #     ../v -experimental -w c2v_test.v
+      #     cd ..
       - name: Build V UI examples
         run: |
           git clone --depth 1 https://github.com/vlang/ui