Finish dependency replacement

airbus-cyber · May 21, 2024 · d57ba2d · d57ba2d
1 parent b361761
commit d57ba2d
Showing 1 changed file with 47 additions and 23 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -413,17 +413,17 @@ jobs:
         run: >
           docker run -v .:/test amazonlinux sh -c "
             yum install -y xz cmake g++ glib2-devel libgcrypt-devel c-ares-devel flex patch readline-devel unzip tar gzip &&
-            tar -xvf test/lua.tar.gz &&
+            tar -xvf /test/lua.tar.gz &&
             cd lua-* &&
             make "MYCFLAGS=-fPIC" linux install &&
             cd .. &&
-            tar -xvf test/wireshark.tar.xz &&
+            tar -xvf /test/wireshark.tar.xz &&
             cd wireshark-* &&
             cmake ${WIRESHARK_CENTOS_BUILD_OPTS} -DENABLE_LUA=ON -DFETCH_lua=OFF -DBUILD_wireshark=OFF -DBUILD_tshark=ON . &&
             make tshark install &&
             cd .. &&
             unzip /test/Wireshark_plugin.zip -d /usr/local &&
-            tar -xvf test/bitop.zip &&
+            unzip /test/bitop.zip &&
             cd LuaBitOp-* &&
             make install &&
             cd .. &&
@@ -468,7 +468,7 @@ jobs:
 
   test_a429_centos_stream9:
     runs-on: ubuntu-latest
-    needs: package_centos_plugin
+    needs: [package_centos_plugin, dependency_download]
     steps:
       - name: Get test files
         uses: actions/checkout@v4
@@ -481,24 +481,33 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: Wireshark-plugin-centos
+      - name: Download LuaBitOp sources
+        uses: actions/download-artifact@v4
+        with:
+          name: LuaBitOp-Sources
+      - name: Download Lua sources
+        uses: actions/download-artifact@v4
+        with:
+          name: Lua-Sources
+      - name: Download Wireshark sources
+        uses: actions/download-artifact@v4
+        with:
+          name: Wireshark-Sources
       - name: Compile and run TShark on ARINC429 traffic
         run: >
           docker run -v .:/test quay.io/centos/centos:stream9 sh -c "
             yum install -y xz cmake g++ glib2-devel libgcrypt-devel c-ares-devel flex patch readline-devel unzip &&
-            curl https://www.lua.org/ftp/lua-${LUA_VERSION}.tar.gz -o lua.tar.gz &&
-            tar -xvf lua.tar.gz &&
+            tar -xvf /test/lua.tar.gz &&
             cd lua-* &&
             make "MYCFLAGS=-fPIC" linux install &&
             cd .. &&
-            curl https://www.wireshark.org/download/src/wireshark-${WIRESHARK_VERSION}.tar.xz -o wireshark.tar.xz &&
-            tar -xvf wireshark.tar.xz &&
+            tar -xvf /test/wireshark.tar.xz &&
             cd wireshark-* &&
             cmake ${WIRESHARK_CENTOS_BUILD_OPTS} -DENABLE_LUA=ON -DFETCH_lua=OFF -DBUILD_wireshark=OFF -DBUILD_tshark=ON . &&
             make tshark install &&
             cd .. &&
             unzip /test/Wireshark_plugin.zip -d /usr/local &&
-            curl http://bitop.luajit.org/download/LuaBitOp-${LUABITOP_VERSION}.tar.gz -o bitop.tar.gz &&
-            tar -xvf bitop.tar.gz &&
+            unzip /test/bitop.zip &&
             cd LuaBitOp-* &&
             make install &&
             cd .. &&
@@ -509,7 +518,7 @@ jobs:
 
   test_discrete_centos_stream9:
     runs-on: ubuntu-latest
-    needs: package_centos_plugin
+    needs: [package_centos_plugin, dependency_download]
     steps:
       - name: Get test files
         uses: actions/checkout@v4
@@ -522,12 +531,15 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: Wireshark-plugin-centos
+      - name: Download Wireshark sources
+        uses: actions/download-artifact@v4
+        with:
+          name: Wireshark-Sources
       - name: Compile and run TShark on ARINC429 traffic
         run: >
           docker run -v .:/test quay.io/centos/centos:stream9 sh -c "
             yum install -y xz cmake g++ glib2-devel libgcrypt-devel c-ares-devel flex patch readline-devel unzip &&
-            curl https://www.wireshark.org/download/src/wireshark-${WIRESHARK_VERSION}.tar.xz -o wireshark.tar.xz &&
-            tar -xvf wireshark.tar.xz &&
+            tar -xvf /test/wireshark.tar.xz &&
             cd wireshark-* &&
             cmake ${WIRESHARK_CENTOS_BUILD_OPTS} -DENABLE_LUA=ON -DFETCH_lua=ON -DBUILD_wireshark=OFF -DBUILD_tshark=ON . &&
             make tshark install &&
@@ -540,7 +552,7 @@ jobs:
 
   test_a429_centos_almalinux:
     runs-on: ubuntu-latest
-    needs: package_centos_plugin
+    needs: [package_centos_plugin, dependency_download]
     steps:
       - name: Get test files
         uses: actions/checkout@v4
@@ -553,24 +565,33 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: Wireshark-plugin-centos
+      - name: Download LuaBitOp sources
+        uses: actions/download-artifact@v4
+        with:
+          name: LuaBitOp-Sources
+      - name: Download Lua sources
+        uses: actions/download-artifact@v4
+        with:
+          name: Lua-Sources
+      - name: Download Wireshark sources
+        uses: actions/download-artifact@v4
+        with:
+          name: Wireshark-Sources
       - name: Compile and run TShark on ARINC429 traffic
         run: >
           docker run -v .:/test almalinux sh -c "
             yum install -y xz cmake g++ glib2-devel libgcrypt-devel c-ares-devel flex patch readline-devel unzip &&
-            curl https://www.lua.org/ftp/lua-${LUA_VERSION}.tar.gz -o lua.tar.gz &&
-            tar -xvf lua.tar.gz &&
+            tar -xvf /test/lua.tar.gz &&
             cd lua-* &&
             make "MYCFLAGS=-fPIC" linux install &&
             cd .. &&
-            curl https://www.wireshark.org/download/src/wireshark-${WIRESHARK_VERSION}.tar.xz -o wireshark.tar.xz &&
-            tar -xvf wireshark.tar.xz &&
+            tar -xvf /test/wireshark.tar.xz &&
             cd wireshark-* &&
             cmake ${WIRESHARK_CENTOS_BUILD_OPTS} -DENABLE_LUA=ON -DFETCH_lua=OFF -DBUILD_wireshark=OFF -DBUILD_tshark=ON . &&
             make tshark install &&
             cd .. &&
             unzip /test/Wireshark_plugin.zip -d /usr/local &&
-            curl http://bitop.luajit.org/download/LuaBitOp-${LUABITOP_VERSION}.tar.gz -o bitop.tar.gz &&
-            tar -xvf bitop.tar.gz &&
+            unzip /test/bitop.zip &&
             cd LuaBitOp-* &&
             make install &&
             cd .. &&
@@ -581,7 +602,7 @@ jobs:
 
   test_discrete_centos_almalinux:
     runs-on: ubuntu-latest
-    needs: package_centos_plugin
+    needs: [package_centos_plugin, dependency_download]
     steps:
       - name: Get test files
         uses: actions/checkout@v4
@@ -594,12 +615,15 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: Wireshark-plugin-centos
+      - name: Download Wireshark sources
+        uses: actions/download-artifact@v4
+        with:
+          name: Wireshark-Sources
       - name: Compile and run TShark on ARINC429 traffic
         run: >
           docker run -v .:/test almalinux sh -c "
             yum install -y xz cmake g++ glib2-devel libgcrypt-devel c-ares-devel flex patch readline-devel unzip &&
-            curl https://www.wireshark.org/download/src/wireshark-${WIRESHARK_VERSION}.tar.xz -o wireshark.tar.xz &&
-            tar -xvf wireshark.tar.xz &&
+            tar -xvf /test/wireshark.tar.xz &&
             cd wireshark-* &&
             cmake ${WIRESHARK_CENTOS_BUILD_OPTS} -DENABLE_LUA=ON -DFETCH_lua=ON -DBUILD_wireshark=OFF -DBUILD_tshark=ON . &&
             make tshark install &&