CI updates for more recent OSs

raidionics · Aug 22, 2023 · 1beb4e3 · 1beb4e3
1 parent 300deee
commit 1beb4e3
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 22 deletions.
diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
@@ -7,17 +7,19 @@ on:
   pull_request:
     branches:
       - '*'
+env:
+  MACOSX_DEPLOYMENT_TARGET: 10.15
 
 jobs:
   build:
     name: Build packages
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Set up Python 3.7
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: "3.7"
 
     - name: Collect submodules
       uses: actions/checkout@v3
@@ -42,9 +44,9 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install matplotlib==3.3.4
         pip install -e git+https://github.com/dbouget/raidionics_rads_lib.git@master#egg=raidionicsrads
         pip install -r assets/requirements.txt
+#        pip install matplotlib==3.3.4
 
     - name: Build software
       run: |
@@ -55,8 +57,8 @@ jobs:
     - name: Make installer
       run: |
         git clone https://github.com/dbouget/quickpkg.git
-        quickpkg/quickpkg dist/Raidionics.app --output Raidionics-1.2.0-macOS.pkg
-        cp -r Raidionics-1.2.0-macOS.pkg dist/Raidionics-1.2.0-macOS.pkg
+        quickpkg/quickpkg dist/Raidionics.app --output Raidionics-1.2.1-macOS.pkg
+        cp -r Raidionics-1.2.1-macOS.pkg dist/Raidionics-1.2.1-macOS.pkg
 
     - name: Upload package
       uses: actions/upload-artifact@v2

diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
@@ -13,11 +13,11 @@ jobs:
     name: Build packages
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v2
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: "3.7"
 
     - name: Collect submodules
       uses: actions/checkout@v3
@@ -57,7 +57,7 @@ jobs:
         cp -r dist/Raidionics assets/Raidionics_ubuntu/usr/local/bin
         dpkg-deb --build --root-owner-group assets/Raidionics_ubuntu
         ls -la
-        cp -r assets/Raidionics_ubuntu.deb dist/Raidionics-1.2.0-ubuntu.deb
+        cp -r assets/Raidionics_ubuntu.deb dist/Raidionics-1.2.1-ubuntu.deb
 
     - name: Upload package
       uses: actions/upload-artifact@v2

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -13,11 +13,11 @@ jobs:
     name: Build packages
     runs-on: windows-2019
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Set up Python 3.7
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: "3.7"
 
     - name: Collect submodules
       uses: actions/checkout@v3
@@ -44,9 +44,9 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install matplotlib==3.3.4
         pip install -e git+https://github.com/dbouget/raidionics_rads_lib.git@master#egg=raidionicsrads
         pip install -r assets/requirements.txt
+#        pip install matplotlib==3.3.4
 
     - name: Build software
       run: |              
@@ -57,7 +57,7 @@ jobs:
     - name: Make installer
       run: |
         makensis.exe assets/Raidionics.nsi
-        cp -r assets/Raidionics-1.2.0-win.exe dist/Raidionics-1.2.0-win.exe
+        cp -r assets/Raidionics-1.2.1-win.exe dist/Raidionics-1.2.1-win.exe
 
     - name: Upload package
       uses: actions/upload-artifact@v2

diff --git a/assets/Raidionics.nsi b/assets/Raidionics.nsi
@@ -1,8 +1,8 @@
 !define APP_NAME "Raidionics"
 !define COMP_NAME "SINTEF"
-!define VERSION "1.2.0"
+!define VERSION "1.2.1"
 !define DESCRIPTION "Application"
-!define INSTALLER_NAME "Raidionics-1.2.0-win.exe"
+!define INSTALLER_NAME "Raidionics-1.2.1-win.exe"
 !define MAIN_APP_EXE "Raidionics.exe"
 !define INSTALL_TYPE "SetShellVarContext current"
 !define REG_ROOT "HKLM"

diff --git a/assets/Raidionics_ubuntu/DEBIAN/control b/assets/Raidionics_ubuntu/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: Raidionics
-Version: 1.2.0
+Version: 1.2.1
 Architecture: i386
 Maintainer: David Bouget <david.bouget@sintef.no>
 Description: Raidionics—Reporting and Data System.

diff --git a/assets/main.spec b/assets/main.spec
@@ -85,7 +85,7 @@ if sys.platform == "darwin":
                     'CFBundleIdentifier': 'Raidionics',
                     'CFBundleInfoDictionaryVersion': '6.0',
                     'CFBundleName': 'Raidionics',
-                    'CFBundleVersion': '1.2.0',
+                    'CFBundleVersion': '1.2.1',
                     'CFBundlePackageType': 'APPL',
                     'LSBackgroundOnly': 'false',
                 },

diff --git a/assets/main_arm.spec b/assets/main_arm.spec
@@ -84,7 +84,7 @@ if sys.platform == "darwin":
                     'CFBundleIdentifier': 'Raidionics',
                     'CFBundleInfoDictionaryVersion': '6.0',
                     'CFBundleName': 'Raidionics',
-                    'CFBundleVersion': '1.2.0',
+                    'CFBundleVersion': '1.2.1',
                     'CFBundlePackageType': 'APPL',
                     'LSBackgroundOnly': 'false',
                 },