ci: move build step for VPM site, into apps and modules ci, add concu…

…rrency config (#21191)
vlang · Apr 5, 2024 · 31fdf58 · 31fdf58
1 parent 5cbed73
commit 31fdf58
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 14 deletions.
diff --git a/.github/workflows/linux_ci.yml b/.github/workflows/linux_ci.yml
@@ -170,8 +170,6 @@ jobs:
       #   run: ./v -o hi.js examples/hello_v_js.v && node hi.js
       # - name: Build Vorum
       #   run: .github/workflows/retry.sh git clone --depth 1 https://github.com/vlang/vorum && cd vorum && ../v . && cd ..
-      - name: Build vpm
-        run: .github/workflows/retry.sh ./v install markdown && .github/workflows/retry.sh git clone --depth 1 https://github.com/vlang/vpm && cd vpm && ../v . || ../v cmd/vpm && cd ..
       - name: Freestanding
         run: ./v -freestanding run vlib/os/bare/bare_example_linux.v
       - name: V self compilation

diff --git a/.github/workflows/macos_ci.yml b/.github/workflows/macos_ci.yml
@@ -29,8 +29,6 @@ jobs:
         run: ./v -o v2 cmd/v && ./v2 -o v3 cmd/v
       - name: Test symlink
         run: ./v symlink
-      - name: Build vpm
-        run: .github/workflows/retry.sh ./v install markdown && .github/workflows/retry.sh 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

diff --git a/.github/workflows/v_apps_and_modules_compile_ci.yml b/.github/workflows/v_apps_and_modules_compile_ci.yml
@@ -3,18 +3,26 @@ name: V Apps and Modules
 on:
   push:
     paths-ignore:
-      - "**.md"
+      - '**.md'
+      - '**.yml'
+      - '!**/v_apps_and_modules_compile_ci.yml'
   pull_request:
     paths-ignore:
-      - "**.md"
+      - '**.md'
+      - '**.yml'
+      - '!**/v_apps_and_modules_compile_ci.yml'
+
+concurrency:
+  group: app-modules-ci-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
 
 jobs:
   v-apps-compile:
     runs-on: ubuntu-latest
     if: >
-        github.event_name != 'push'
-        || github.event.ref == 'refs/heads/master'
-        || github.event.repository.full_name != 'vlang/v'
+      github.event_name != 'push'
+      || github.event.ref == 'refs/heads/master'
+      || github.event.repository.full_name != 'vlang/v'
     timeout-minutes: 121
     steps:
       - uses: actions/checkout@v4
@@ -167,7 +175,6 @@ jobs:
           echo "MessagePack examples should compile"
           v should-compile-all ~/.vmodules/msgpack/examples
 
-
 #      - name: Build VEX
 #        run: |
 #          echo "Install Vex"
@@ -179,13 +186,12 @@ jobs:
 #          echo "Run Vex Tests"
 #          v test ~/.vmodules/nedpals/vex
 
-
   vsl-and-vtl-compile:
     runs-on: ubuntu-20.04
     if: >
-        github.event_name != 'push'
-        || github.event.ref == 'refs/heads/master'
-        || github.event.repository.full_name != 'vlang/v'
+      github.event_name != 'push'
+      || github.event.ref == 'refs/heads/master'
+      || github.event.repository.full_name != 'vlang/v'
     timeout-minutes: 121
     env:
       VFLAGS: -no-parallel
@@ -239,3 +245,19 @@ jobs:
           ~/.vmodules/vtl/bin/test --use-gc boehm
           echo "Execute Tests using Pure V Backend with Pure V Math and Garbage Collection enabled"
           ~/.vmodules/vtl/bin/test --use-cblas --use-gc boehm
+
+  vpm-site:
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, macos-12]
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build V
+        run: make -j4 && ./v doctor
+      - name: Build vpm
+        run: |
+          .github/workflows/retry.sh ./v install markdown
+          .github/workflows/retry.sh git clone --depth 1 https://github.com/vlang/vpm
+          cd vpm && ../v .