From d140bc53076f4568bd078f9dd4186a21b565ccf9 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 1 Feb 2024 16:12:04 -0600 Subject: [PATCH 1/7] action-macos-arm64.yml -> pip install cadquery-ocp from direct link --- .github/actions/setup/action-macos-arm64.yml | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/actions/setup/action-macos-arm64.yml diff --git a/.github/actions/setup/action-macos-arm64.yml b/.github/actions/setup/action-macos-arm64.yml new file mode 100644 index 0000000..143dc3c --- /dev/null +++ b/.github/actions/setup/action-macos-arm64.yml @@ -0,0 +1,22 @@ +name: 'Setup' +inputs: + python-version: # id of input + description: 'Python version' + required: true + +runs: + using: "composite" + steps: + - name: python + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: install requirements + shell: bash + run: | + pip install wheel + pip install mypy + pip install pytest + pip install pylint + pip install https://github.com/jdegenstein/ocp-build-system/releases/download/7.7.2_macos_arm64_cp310/cadquery_ocp-7.7.2-cp310-cp310-macosx_11_0_arm64.whl + pip install . From 0c478cf081a07441c01f7a2f6d5f20ab52edbb30 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 1 Feb 2024 16:14:39 -0600 Subject: [PATCH 2/7] test.yml -> add MacOS arm64 testing for python 3.10 --- .github/workflows/test.yml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 422fe93..ce0483e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ name: tests -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: tests: @@ -17,10 +17,30 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - - uses: ./.github/actions/setup + - uses: ./.github/actions/setup/action.yml with: python-version: ${{ matrix.python-version }} - name: test run: | python -m pytest + tests: + strategy: + fail-fast: false + matrix: + python-version: [ + #"3.9", + "3.10", + #"3.11" + ] + os: [macos14] + + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/setup/action-macos-arm64.yml + with: + python-version: ${{ matrix.python-version }} + - name: test + run: | + python -m pytest From 74c4bcd37cc7065adf3b35de7763df1cc45e4127 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 1 Feb 2024 16:18:43 -0600 Subject: [PATCH 3/7] test.yml fix typo --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ce0483e..5426952 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,7 +33,7 @@ jobs: "3.10", #"3.11" ] - os: [macos14] + os: [macos-14] runs-on: ${{ matrix.os }} steps: From 59cbc34061c2b56dc4c8f7fb39e608816524f5f1 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 1 Feb 2024 16:20:49 -0600 Subject: [PATCH 4/7] Update test.yml -> unique jobs names --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5426952..815e388 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: tests on: [push, pull_request, workflow_dispatch] jobs: - tests: + tests_x86_64: strategy: fail-fast: false matrix: @@ -24,7 +24,7 @@ jobs: run: | python -m pytest - tests: + tests_arm64: strategy: fail-fast: false matrix: From 2f183dae82c734ab5b25c4552b01b19efa701f23 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 1 Feb 2024 16:29:33 -0600 Subject: [PATCH 5/7] Create action.yml for macos arm64 --- .github/actions/setup-macos-arm64/action.yml | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/actions/setup-macos-arm64/action.yml diff --git a/.github/actions/setup-macos-arm64/action.yml b/.github/actions/setup-macos-arm64/action.yml new file mode 100644 index 0000000..143dc3c --- /dev/null +++ b/.github/actions/setup-macos-arm64/action.yml @@ -0,0 +1,22 @@ +name: 'Setup' +inputs: + python-version: # id of input + description: 'Python version' + required: true + +runs: + using: "composite" + steps: + - name: python + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: install requirements + shell: bash + run: | + pip install wheel + pip install mypy + pip install pytest + pip install pylint + pip install https://github.com/jdegenstein/ocp-build-system/releases/download/7.7.2_macos_arm64_cp310/cadquery_ocp-7.7.2-cp310-cp310-macosx_11_0_arm64.whl + pip install . From b600057c8c92e8a5ae75ccf8374095d58976084e Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 1 Feb 2024 16:29:50 -0600 Subject: [PATCH 6/7] test.yml point to correct action --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 815e388..923a8fa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - - uses: ./.github/actions/setup/action.yml + - uses: ./.github/actions/setup/ with: python-version: ${{ matrix.python-version }} - name: test @@ -38,7 +38,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - - uses: ./.github/actions/setup/action-macos-arm64.yml + - uses: ./.github/actions/setup-macos-arm64/ with: python-version: ${{ matrix.python-version }} - name: test From fd3ec571af88c4ee6c76d7a7d1e141202aeb0b7b Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 1 Feb 2024 16:32:45 -0600 Subject: [PATCH 7/7] Delete .github/actions/setup/action-macos-arm64.yml --- .github/actions/setup/action-macos-arm64.yml | 22 -------------------- 1 file changed, 22 deletions(-) delete mode 100644 .github/actions/setup/action-macos-arm64.yml diff --git a/.github/actions/setup/action-macos-arm64.yml b/.github/actions/setup/action-macos-arm64.yml deleted file mode 100644 index 143dc3c..0000000 --- a/.github/actions/setup/action-macos-arm64.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: 'Setup' -inputs: - python-version: # id of input - description: 'Python version' - required: true - -runs: - using: "composite" - steps: - - name: python - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: install requirements - shell: bash - run: | - pip install wheel - pip install mypy - pip install pytest - pip install pylint - pip install https://github.com/jdegenstein/ocp-build-system/releases/download/7.7.2_macos_arm64_cp310/cadquery_ocp-7.7.2-cp310-cp310-macosx_11_0_arm64.whl - pip install .