wip

nitlang · Jun 25, 2024 · 97ecb7e · 97ecb7e
1 parent 297f213
commit 97ecb7e
Showing 1 changed file with 13 additions and 38 deletions.
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
@@ -124,11 +124,22 @@ jobs:
   nitunit-lib:
     runs-on: ubuntu-24.04
     needs: [build]
+    container: "ubuntu:24.04"
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_HOST_AUTH_METHOD: trust
+      mongo:
+        image: mongo
+      neo4j:
+        image: 'neo4j:2.3'
+        env:
+          NEO4J_AUTH: none
     steps:
     - uses: actions/checkout@v4
     - name: Install dependencies
-      run: sudo apt-get update && sudo apt-get install -y $BASIC_PACKAGES $MORE_PACKAGES
-    - run: sudo misc/jenkins/install-more.sh
+      run: apt-get update && apt-get install -y $BASIC_PACKAGES $MORE_PACKAGES
     - uses: actions/download-artifact@v4
     - run: chmod +x bin/*
     - run: make nitunit-lib
@@ -173,7 +184,6 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install dependencies
       run: sudo apt-get update && sudo apt-get install -y $BASIC_PACKAGES $MORE_PACKAGES
-    - run: sudo misc/jenkins/install-more.sh
     - uses: actions/download-artifact@v4
     - run: chmod +x bin/*
     - run: 'PATH=$PWD/bin:$PATH make test-contrib'
@@ -246,38 +256,3 @@ jobs:
     - run: git log --oneline --graph --decorate | head -n 50
     - run: cat /etc/issue
     - run: cat /etc/os-release
-
-
-  nitunit-services:
-    runs-on: ubuntu-24.04
-    needs: [build]
-    container: "ubuntu:24.04"
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_HOST_AUTH_METHOD: trust
-      mongo:
-        image: mongo
-      neo4j:
-        image: 'neo4j:2.3'
-        env:
-          NEO4J_AUTH: none
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install dependencies
-      run: apt-get update && apt-get install -y $BASIC_PACKAGES $MORE_PACKAGES
-    - uses: actions/download-artifact@v4
-    - run: chmod +x bin/*
-    - run: bin/nitunit lib/mongodb lib/neo4j lib/postgresql
-    - uses: actions/upload-artifact@v4
-      if: success() || failure()
-      with:
-        path: '*.xml'
-        name: nitunit-services
-    - uses: EnricoMi/publish-unit-test-result-action@v2
-      if: success() || failure()
-      with:
-        files: "*.xml"
-        comment_mode: off
-        check_name: 'nitunit-services Results'