Split actions and deploy only when merged

fusioninventory · Sep 15, 2024 · 4ed700d · 4ed700d
1 parent ef5558b
commit 4ed700d
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 65 deletions.
diff --git a/.github/workflows/test_build.yaml → .github/workflows/build.yaml b/.github/workflows/test_build.yaml → .github/workflows/build.yaml
@@ -7,71 +7,6 @@ on:
     branches: [ main ]
 
 jobs:
-  test_FreeBSD:
-    runs-on: ubuntu-latest
-    name: Test - FreeBSD
-    steps:
-      - uses: actions/checkout@v4
-      - name: Run tests under FreeBSD
-        uses: vmactions/freebsd-vm@v1
-        with:
-          usesh: true
-          prepare: |
-            pkg install -y rust
-          run: |
-            cargo test
-
-  test_others:
-    name: Test - ${{ matrix.platform.release_for }}
-    strategy:
-      matrix:
-        platform:
-          - release_for: Windows-x86_64
-            os: windows-latest
-            target: x86_64-pc-windows-msvc
-            bin: fusioninventory-agent.exe
-            name: fusioninventory-agent-Windows-x86_64.zip
-            command: test
-
-          # - release_for: macOS-x86_64
-          #   os: macOS-latest
-          #   target: x86_64-apple-darwin
-          #   bin: fusioninventory-agent
-          #   name: fusioninventory-agent-Darwin-x86_64.tar.gz
-          #   command: both
-
-          - release_for: Linux-x86_64
-            os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-            bin: fusioninventory-agent
-            name: fusioninventory-agent-Linux-x86_64.tar.gz
-            command: test
-
-          # - release_for: Linux-i686
-          #   os: ubuntu-latest
-          #   target: i686-unknown-linux-gnu
-          #   bin: fusioninventory-agent
-          #   name: fusioninventory-agent-Linux-i686.tar.gz
-          #   command: test
-
-          # For rapsberry pi
-          # armv7-unknown-linux-gnueabihf
-
-    runs-on: ${{ matrix.platform.os }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Rust cache
-        uses: Swatinem/rust-cache@v2
-      - name: Build binary
-        uses: houseabsolute/actions-rust-cross@v0
-        with:
-          command: ${{ matrix.platform.command }}
-          target: ${{ matrix.platform.target }}
-          args: "--locked --release"
-          cross-version: "19be83481fd3e50ea103d800d72e0f8eddb1c90c"
-          strip: true
-
   build_FreeBSD_14_x:
     runs-on: ubuntu-latest
     name: Build - FreeBSD 14.x
@@ -100,6 +35,7 @@ jobs:
           cp -fr src/static static
           zip -r "fusioninventory-agent-${{ fromJson(steps.info.outputs.object).package.version }}_freebsd_14.x.zip" fusioninventory-agent agent.cfg static
       - name: Deploy with rsync
+        if: ${{ github.event.pull_request.merged }}
         uses: "Pendect/[email protected]"
         env: 
           DEPLOY_KEY: ${{ secrets.SSH_DOCUMENTATION_KEY }}
@@ -138,6 +74,7 @@ jobs:
           cp -fr src/static static
           zip -r "fusioninventory-agent-${{ fromJson(steps.info.outputs.object).package.version }}_freebsd_13.x.zip" fusioninventory-agent agent.cfg static
       - name: Deploy with rsync
+        if: ${{ github.event.pull_request.merged }}
         uses: "Pendect/[email protected]"
         env: 
           DEPLOY_KEY: ${{ secrets.SSH_DOCUMENTATION_KEY }}
@@ -258,5 +195,6 @@ jobs:
           Remove-Variable -Name Key
         # TODO for windows get dmidecode.exe to put in zip file
       - name: scp deployments
+        if: ${{ github.event.pull_request.merged }}
         run: |
           scp -o StrictHostKeyChecking=no -i "${{ steps.rsync.outputs.ssh_key_path }}" 'fusioninventory-agent-${{ fromJson(steps.info.outputs.object).package.version }}_${{ matrix.platform.target }}.zip' '${{ secrets.SSH_DOCUMENTATION_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEV_PATH }}/'
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -0,0 +1,73 @@
+name: Test & build
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test_FreeBSD:
+    runs-on: ubuntu-latest
+    name: Test - FreeBSD
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run tests under FreeBSD
+        uses: vmactions/freebsd-vm@v1
+        with:
+          usesh: true
+          prepare: |
+            pkg install -y rust
+          run: |
+            cargo test
+
+  test_others:
+    name: Test - ${{ matrix.platform.release_for }}
+    strategy:
+      matrix:
+        platform:
+          - release_for: Windows-x86_64
+            os: windows-latest
+            target: x86_64-pc-windows-msvc
+            bin: fusioninventory-agent.exe
+            name: fusioninventory-agent-Windows-x86_64.zip
+            command: test
+
+          # - release_for: macOS-x86_64
+          #   os: macOS-latest
+          #   target: x86_64-apple-darwin
+          #   bin: fusioninventory-agent
+          #   name: fusioninventory-agent-Darwin-x86_64.tar.gz
+          #   command: both
+
+          - release_for: Linux-x86_64
+            os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            bin: fusioninventory-agent
+            name: fusioninventory-agent-Linux-x86_64.tar.gz
+            command: test
+
+          # - release_for: Linux-i686
+          #   os: ubuntu-latest
+          #   target: i686-unknown-linux-gnu
+          #   bin: fusioninventory-agent
+          #   name: fusioninventory-agent-Linux-i686.tar.gz
+          #   command: test
+
+          # For rapsberry pi
+          # armv7-unknown-linux-gnueabihf
+
+    runs-on: ${{ matrix.platform.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Rust cache
+        uses: Swatinem/rust-cache@v2
+      - name: Build binary
+        uses: houseabsolute/actions-rust-cross@v0
+        with:
+          command: ${{ matrix.platform.command }}
+          target: ${{ matrix.platform.target }}
+          args: "--locked --release"
+          cross-version: "19be83481fd3e50ea103d800d72e0f8eddb1c90c"
+          strip: true