[CI] Use same runtime deps for releases and for integration tests

katyukha · Mar 24, 2023 · 937673d · 937673d
1 parent 6e23537
commit 937673d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 50 deletions.
diff --git a/.ci/deps/ubuntu.22.04.txt b/.ci/deps/ubuntu.22.04.txt
@@ -21,4 +21,3 @@ fontconfig
 libmagic1
 postgresql-client
 lsb-base
-
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ on:
       - 'v*.*.*-RC*'
 
 env:
-  ODOOD_DLANG_COMPILER: ldc-1.31.0
+  ODOOD_DLANG_COMPILER: ldc-1.32.0
 
 jobs:
   build-ubuntu-20_04:
@@ -30,6 +30,11 @@ jobs:
           dub build -b release -c bash-autocomplete --override-config=pyd/python38
           dub build -b release --override-config=pyd/python38
 
+      - name: Prepare dependencies for deb package
+        id: prepare_deb_deps
+        run: |
+          echo "ubuntu_20_04_deps=$(cat .ci/deps/ubuntu.20.04.txt | tr '\n' ',' | sed 's/,$/\n/')" >> $GITHUB_OUTPUT
+
       - name: Prepare debian build
         run: |
           mkdir -p .debpkg/usr/bin
@@ -47,30 +52,7 @@ jobs:
           maintainer: Dmytro Katyukha <dmytro.katyukha@gmail.com>
           version: ${{ github.ref_name }} # v*.*.*
           arch: 'amd64'
-          depends: >-
-            sudo,
-            bash-completion,
-            libzip5,
-            python3,
-            python3-virtualenv,
-            python3-dev,
-            libpq-dev,
-            libsass-dev,
-            libjpeg-dev,
-            libyaml-dev,
-            libfreetype6-dev,
-            zlib1g-dev,
-            libxml2-dev,
-            libxslt-dev,
-            bzip2,
-            libsasl2-dev,
-            libldap2-dev,
-            libssl-dev,
-            libffi-dev,
-            fontconfig,
-            libmagic1,
-            postgresql-client,
-            lsb-base
+          depends: ${{ steps.prepare_deb_deps.outputs.ubuntu_20_04_deps }}
           desc: 'Odood - the easy way to handle multiple local Odoo installations.'
 
       - name: Move deb package to build dir with correct name
@@ -107,6 +89,11 @@ jobs:
           dub build -b release -c bash-autocomplete --override-config=pyd/python310
           dub build -b release --override-config=pyd/python310
 
+      - name: Prepare dependencies for deb package
+        id: prepare_deb_deps
+        run: |
+          echo "ubuntu_22_04_deps=$(cat .ci/deps/ubuntu.22.04.txt | tr '\n' ',' | sed 's/,$/\n/')" >> $GITHUB_OUTPUT
+
       - name: Prepare debian build
         run: |
           mkdir -p .debpkg/usr/bin
@@ -124,30 +111,7 @@ jobs:
           maintainer: Dmytro Katyukha <dmytro.katyukha@gmail.com>
           version: ${{ github.ref_name }} # v*.*.*
           arch: 'amd64'
-          depends: >-
-            sudo,
-            bash-completion,
-            libzip4,
-            python3,
-            python3-virtualenv,
-            python3-dev,
-            libpq-dev,
-            libsass-dev,
-            libjpeg-dev,
-            libyaml-dev,
-            libfreetype6-dev,
-            zlib1g-dev,
-            libxml2-dev,
-            libxslt-dev,
-            bzip2,
-            libsasl2-dev,
-            libldap2-dev,
-            libssl-dev,
-            libffi-dev,
-            fontconfig,
-            libmagic1,
-            postgresql-client,
-            lsb-base
+          depends: ${{ steps.prepare_deb_deps.outputs.ubuntu_22_04_deps }}
           desc: 'Odood - the easy way to handle multiple local Odoo installations.'
 
       - name: Move deb package to build dir with correct name
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,4 +21,3 @@ fontconfig
		libmagic1
		postgresql-client
		lsb-base