github-action - integrate composite install dependecies action to wor…

…kflows
CESNET · Oct 3, 2024 · 0332ac4 · 0332ac4
1 parent bf19450
commit 0332ac4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,11 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     container: ${{ inputs.os }}
     steps:
-    - name: Install dependencies
-      run: |
-        dnf install -y make gcc-c++ cmake3 git rpm-build fuse3-devel
+    - name: Install git
+      run: dnf install -y git
     - name: Check out repository code
       uses: actions/checkout@v4
+    - name: Install dependencies
+      uses: ./.github/actions/install-dependencies
     - name: Mark github workspace as safe
       run: git config --system --add safe.directory $PWD
     - name: make

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -7,11 +7,14 @@ jobs:
     runs-on: ubuntu-latest
     container: oraclelinux:9
     steps:
+    - name: Install git
+      run: dnf install -y git
     - name: Check out repository code
       uses: actions/checkout@v4
     - name: Install dependencies
-      run: |
-        dnf install -y make gcc-c++ clang clang-tools-extra cmake3 git rpm-build fuse3-devel
+      uses: ./.github/actions/install-dependencies
+      with:
+        clang-tools: true
     - name: make format-check
       run: make format
     - name: make tidy-check

diff --git a/.github/workflows/copr.yaml b/.github/workflows/copr.yaml
@@ -1,6 +1,6 @@
 name: release package on copr
 
-on: 
+on:
   push:
     branches:
       - release
@@ -10,22 +10,26 @@ jobs:
     runs-on: ubuntu-latest
     container: oraclelinux:8
     steps:
+    - name: Install git
+      run: dnf install -y git
+    - name: Check out repository code
+      uses: actions/checkout@v4
     - name: Install dependencies
+      uses: ./.github/actions/install-dependencies
+    - name: Install copr-cli
       run: |
         dnf install -y dnf-plugins-core epel-release
         dnf -y copr enable @CESNET/NEMEA
-        dnf install -y make gcc-c++ cmake3 git rpm-build fuse3-devel copr-cli
-    - name: Check out repository code
-      uses: actions/checkout@v4
+        dnf install -y copr-cli
     - name: Mark github workspace as safe
       run: git config --system --add safe.directory $PWD
     - name: make rpm
       run: make rpm
     - name: Create copr config
       run: |
         mkdir ~/.config
-        echo "${{ secrets.COPR_CONFIG }}" >> ~/.config/copr 
-    - name: Upload SRPM to copr	
+        echo "${{ secrets.COPR_CONFIG }}" >> ~/.config/copr
+    - name: Upload SRPM to copr
       run: |
         copr build @CESNET/NEMEA build/pkg/rpm/rpmbuild/SRPMS/*
         copr build @CESNET/NEMEA-stable build/pkg/rpm/rpmbuild/SRPMS/*