Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NXDRIVE-2980: Implement GitHub runner for macos intel based architecture #5484

Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c1a91bc
Update release.yml
gitofanindya Sep 2, 2024
ad657a7
Update requirements.txt
gitofanindya Sep 2, 2024
d3f10a3
Update deploy_ci_agent.sh
gitofanindya Sep 3, 2024
1937722
Merge branch 'master' of https://github.com/nuxeo/nuxeo-drive into Gi…
gitofanindya Nov 11, 2024
e953fef
modified: tools/osx/deploy_ci_agent.sh
gitofanindya Nov 11, 2024
9ec0aee
undo: tools/osx/deploy_ci_agent.sh
gitofanindya Nov 11, 2024
567d49a
Update requirements.txt
gitofanindya Nov 29, 2024
6eb77ee
Update 5.5.1.md
gitofanindya Nov 29, 2024
e1dc431
Update deploy_ci_agent.sh
gitofanindya Nov 29, 2024
244f7de
Update deploy_ci_agent.sh
gitofanindya Nov 29, 2024
55311b5
Update requirements.txt
gitofanindya Nov 29, 2024
e8efbd8
Update deploy_ci_agent.sh
gitofanindya Dec 3, 2024
4a15c32
Update deploy_ci_agent.sh
gitofanindya Dec 3, 2024
307ef5f
Update deploy_ci_agent.sh
gitofanindya Dec 4, 2024
fc9b084
Update functional_tests.yml
gitofanindya Dec 5, 2024
f6c2f42
Update functional_tests_2023.yml
gitofanindya Dec 5, 2024
5237c84
Update unit_tests.yml
gitofanindya Dec 5, 2024
90134c7
Update __main__.py
gitofanindya Dec 5, 2024
4431051
Update __main__.py
gitofanindya Dec 5, 2024
eae031f
Update direct_edit.py
gitofanindya Dec 5, 2024
a533c66
Update direct_edit.py
gitofanindya Dec 5, 2024
8d44df9
Update engine.py
gitofanindya Dec 5, 2024
507b676
Merge branch 'master' into wip-NXDRIVE-2980-implement-github-runner-f…
mr-shekhar Dec 5, 2024
535a564
Update engine.py
gitofanindya Dec 5, 2024
2b7930c
Update functional_tests.yml
gitofanindya Dec 6, 2024
f071e8f
Update functional_tests_2023.yml
gitofanindya Dec 6, 2024
66c2a37
Update integration_tests.yml
gitofanindya Dec 6, 2024
d7d2f96
Update unit_tests.yml
gitofanindya Dec 6, 2024
563849e
Update engine.py
gitofanindya Dec 6, 2024
9e09e90
Update functional_tests.yml
gitofanindya Dec 6, 2024
2f6350f
Update functional_tests_2023.yml
gitofanindya Dec 6, 2024
50a2fc6
Update integration_tests.yml
gitofanindya Dec 6, 2024
78d54b8
Update unit_tests.yml
gitofanindya Dec 6, 2024
4670638
Update engine.py
gitofanindya Dec 6, 2024
b14c940
Checking Codecov action 5.1.1
poojadaine Dec 9, 2024
e6379f2
Reverting back Codecov action 3.1.5
poojadaine Dec 9, 2024
b8096c4
Updating 5.5.1.md
poojadaine Dec 9, 2024
6f4ba42
Bump codecov/codecov-action from 3.1.5 to 5.1.1 (#5504)
dependabot[bot] Dec 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tools/deps/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 0 additions & 2 deletions tools/osx/deploy_ci_agent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
Loading