NXDRIVE-2980: Implement GitHub runner for macos intel based architect…

…ure (#5484) NXDRIVE-2980: Implement GitHub runner for macos intel based architecture --------- Co-authored-by: mr-shekhar <[email protected]> Co-authored-by: poojadaine <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
nuxeo · Dec 9, 2024 · 9642572 · 9642572
1 parent 8afe9d6
commit 9642572
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/functional_tests.yml b/.github/workflows/functional_tests.yml
@@ -50,15 +50,15 @@ jobs:
           DISPLAY: ":99"
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml
           flags: functional
           env_vars: OS,PYTHON
 
   functional-tests-macos:
-    runs-on: "macos-latest"
+    runs-on: "macos-13"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -80,7 +80,7 @@ jobs:
         run: tox -e ft
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml
@@ -111,7 +111,7 @@ jobs:
         run: tox -e ft
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml

diff --git a/.github/workflows/functional_tests_2023.yml b/.github/workflows/functional_tests_2023.yml
@@ -50,15 +50,15 @@ jobs:
           DISPLAY: ":99"
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml
           flags: functional
           env_vars: OS,PYTHON
 
   functional-tests-macos:
-    runs-on: "macos-latest"
+    runs-on: "macos-13"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -80,7 +80,7 @@ jobs:
         run: tox -e ft
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml
@@ -105,7 +105,7 @@ jobs:
         run: tox -e ft
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -61,7 +61,7 @@ jobs:
         run: tox -e integration
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, 'macos-latest']
+        os: [ubuntu-latest, windows-latest, 'macos-13']
 
     steps:
       - name: Checkout
@@ -96,29 +96,29 @@ jobs:
       #
 
       - name: "[macOS] Setup certificates"
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-13'
         run: |
           wget https://www.apple.com/appleca/AppleIncRootCertificate.cer
           echo "${{ secrets.CERT_APP_MACOS }}" | base64 --decode > developerID_application.p12
           echo "${{ secrets.PRIV_APP_MACOS }}" | base64 --decode > nuxeo-drive.priv
 
       #- name: "[macOS] Downloading Python"
-      #  if: matrix.os == 'macos-latest'
+      #  if: matrix.os == 'macos-13'
       #  run: curl https://www.python.org/ftp/python/3.9.5/python-3.9.5-macosx10.9.pkg -o "python.pkg" # XXX_PYTHON
 
       #- name: "[macOS] Install Python"
-      #  if: matrix.os == 'macos-latest'
+      #  if: matrix.os == 'macos-13'
       #  run: sudo installer -pkg python.pkg -target /
 
       - name: "[macOS] Setup the environment"
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-13'
         env:
           MACOSX_DEPLOYMENT_TARGET: "11.3"
           SYSTEM_VERSION_COMPAT: 0
         run: bash tools/osx/deploy_ci_agent.sh --install-release
 
       - name: "[macOS] Generate the .dmg and validate against 2021"
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-13'
         timeout-minutes: 20
         env:
           NXDRIVE_TEST_NUXEO_URL: "https://drive-2021.beta.nuxeocloud.com/nuxeo"
@@ -134,7 +134,7 @@ jobs:
         run: bash tools/osx/deploy_ci_agent.sh --check-upgrade
 
       - name: "[macOS] Generate the .dmg and validate against 2023"
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-13'
         timeout-minutes: 20
         env:
           NXDRIVE_TEST_NUXEO_URL: "https://drive-2023.beta.nuxeocloud.com/nuxeo"

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -40,15 +40,15 @@ jobs:
         run: tox -e unit
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml
           flags: unit
           env_vars: OS,PYTHON
 
   unit-tests-macos:
-    runs-on: "macos-latest"
+    runs-on: "macos-13"
     env:
       SYSTEM_VERSION_COMPAT: 0
     steps:
@@ -73,7 +73,7 @@ jobs:
         run: tox -e unit
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml
@@ -106,7 +106,7 @@ jobs:
         run: tox -e unit
       - name: Upload coverage to Codecov
         if: ${{ success() }} || ${{ failure() }}
-        uses: codecov/codecov-action@v3.1.5
+        uses: codecov/codecov-action@v5.1.1
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           files: ./coverage.xml

diff --git a/docs/changes/5.5.1.md b/docs/changes/5.5.1.md
@@ -17,19 +17,20 @@ Release date: `2024-xx-xx`
 - [NXDRIVE-2925](https://jira.nuxeo.com/browse/NXDRIVE-2925): Ignore zero-byte files
 
 ### Task Management
+
 - [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
 
 ## GUI
 
-- [NXDRIVE-2](https://jira.nuxeo.com/browse/NXDRIVE-2):
 - [NXDRIVE-2962] (https://jira.nuxeo.com/browse/NXDRIVE-2962): Update Translation Files
 
 ## Packaging / Build
 
+- [NXDRIVE-2954](https://jira.nuxeo.com/browse/NXDRIVE-2954): [Mac] Certificate needs to be renewed
 - [NXDRIVE-2970](https://jira.nuxeo.com/browse/NXDRIVE-2970): Fix security issue: urllib3's Proxy-Authorization request header isn't stripped during cross-origin redirects
 - [NXDRIVE-2971](https://jira.nuxeo.com/browse/NXDRIVE-2971): Fix security issue: pyca/cryptography has a vulnerable OpenSSL included in cryptography wheels
-- [NXDRIVE-2954](https://jira.nuxeo.com/browse/NXDRIVE-2954): [Mac] Certificate needs to be renewed
 - [NXDRIVE-2976](https://hyland.atlassian.net/browse/NXDRIVE-2976): Fix security issue: Black vulnerable to Regular Expression Denial of Service (ReDoS)
+- [NXDRIVE-2980](https://jira.nuxeo.com/browse/NXDRIVE-2980): Implement GitHub runner for macos intel based architecture
 
 ## Tests
 
@@ -50,6 +51,7 @@ Release date: `2024-xx-xx`
 - Upgraded `build` from 1.2.1 to 1.2.2
 - Upgraded `cachetools` from 5.3.3 to 5.5.0
 - Upgraded `certifi` from 2023.7.22 to 2024.7.4
+- Upgraded `codecov/codecov-action` from 3.1.5 to 5.1.1 
 - Upgraded `cryptography` from 42.0.5 to 43.0.1
 - Upgraded `docutils` from 0.20.1 to 0.21.2
 - Upgraded `execnet` from 2.0.2 to 2.1.1

diff --git a/tools/deps/requirements.txt b/tools/deps/requirements.txt
@@ -325,7 +325,7 @@ pyqt5==5.15.10 \
     --hash=sha256:d46b7804b1b10a4ff91753f8113e5b5580d2b4462f3226288e2d84497334898a \
     --hash=sha256:ff99b4f91aa8eb60510d5889faad07116d3340041916e46c07d519f7cad344e1
 PyQt5-Qt5==5.15.13 ; sys_platform == "darwin" \
-    --hash=sha256:141859f2ffe04cc6c5db970e2b6ad9f98897805d886a14c52614e3799daab6d6
+    --hash=sha256:92575a9e96a27c4ed67c56c7048ded7461a1655d5d21f0e05064664e6e9fcbdf
 PyQt5-Qt5==5.15.2 ; sys_platform != "darwin" \
     --hash=sha256:9cc7a768b1921f4b982ebc00a318ccb38578e44e45316c7a4a850e953e1dd327 \
     --hash=sha256:750b78e4dba6bdf1607febedc08738e318ea09e9b10aea9ff0d73073f11f6962 \

diff --git a/tools/osx/deploy_ci_agent.sh b/tools/osx/deploy_ci_agent.sh
@@ -159,8 +159,6 @@ create_package() {
     hdiutil create                         \
             -srcfolder "${src_folder_tmp}" \
             -volname "${app_name}"         \
-            -fs HFS+                       \
-            -fsargs "-c c=64,a=16,e=16"    \
             -format UDRW                   \
             -size "${dmg_size}m"           \
             "${dmg_tmp}"