Skip to content

Commit

Permalink
Merge branch 'main' into feature/distribute-micromamba
Browse files Browse the repository at this point in the history
  • Loading branch information
emlys committed Aug 5, 2024
2 parents 7e07c6f + 1c98e3a commit c8cdd88
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 14 deletions.
28 changes: 16 additions & 12 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
fail-fast: false
matrix:
python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
os: [windows-latest, macos-latest]
os: [windows-latest, macos-13]
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -160,9 +160,11 @@ jobs:
strategy:
matrix:
python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
os: [windows-latest, macos-latest]
os: [windows-latest, macos-13]
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Fetch complete history for accurate versioning

- uses: ./.github/actions/setup_env
with:
Expand All @@ -176,7 +178,9 @@ jobs:
# computer is guaranteed to have cython available at build
# time. Thus, it is no longer necessary to distribute the
# .cpp files in addition to the .pyx files.
python -m build --sdist
#
# Elevating any python warnings to errors to catch build issues ASAP.
python -W error -m build --sdist
- name: Install from source distribution
run : |
Expand All @@ -199,17 +203,17 @@ jobs:
# overwrite artifacts or have duplicates (mac/windows sdists have
# different extensions)
- name: Authenticate GCP
if: github.event_name != 'pull_request' && matrix.os == 'macos-latest' && matrix.python-version == env.LATEST_SUPPORTED_PYTHON_VERSION
if: github.event_name != 'pull_request' && matrix.os == 'macos-13' && matrix.python-version == env.LATEST_SUPPORTED_PYTHON_VERSION
uses: google-github-actions/auth@v0
with:
credentials_json: ${{ secrets.GOOGLE_SERVICE_ACC_KEY }}

- name: Set up GCP
if: github.event_name != 'pull_request' && matrix.os == 'macos-latest' && matrix.python-version == env.LATEST_SUPPORTED_PYTHON_VERSION
if: github.event_name != 'pull_request' && matrix.os == 'macos-13' && matrix.python-version == env.LATEST_SUPPORTED_PYTHON_VERSION
uses: google-github-actions/setup-gcloud@v0

- name: Deploy artifacts to GCS
if: github.event_name != 'pull_request' && matrix.os == 'macos-latest' && matrix.python-version == env.LATEST_SUPPORTED_PYTHON_VERSION
if: github.event_name != 'pull_request' && matrix.os == 'macos-13' && matrix.python-version == env.LATEST_SUPPORTED_PYTHON_VERSION
run: make deploy

validate-resources:
Expand Down Expand Up @@ -244,7 +248,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
os: [windows-latest, macos-latest]
os: [windows-latest, macos-13]

steps:
- name: Check out repo
Expand Down Expand Up @@ -294,9 +298,9 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-latest, windows-latest]
os: [macos-13, windows-latest]
include:
- os: macos-latest
- os: macos-13
puppeteer-log: ~/Library/Logs/invest-workbench/
workspace-path: InVEST-failed-mac-workspace.tar
binary-extension: dmg
Expand Down Expand Up @@ -388,7 +392,7 @@ jobs:
yarn run dist
- name: Build Workbench (macOS)
if: github.event_name != 'pull_request' && matrix.os == 'macos-latest' # secrets not available in PR
if: github.event_name != 'pull_request' && matrix.os == 'macos-13' # secrets not available in PR
working-directory: workbench
env:
GH_TOKEN: env.GITHUB_TOKEN
Expand Down Expand Up @@ -418,7 +422,7 @@ jobs:
run: npx cross-env CI=true yarn run test-electron-app

- name: Sign binaries (macOS)
if: github.event_name != 'pull_request' && matrix.os == 'macos-latest' # secrets not available in PR
if: github.event_name != 'pull_request' && matrix.os == 'macos-13' # secrets not available in PR
env:
CERT_FILE: 2025-01-16-Expiry-AppStore-App.p12
CERT_PASS: ${{ secrets.MACOS_CODESIGN_CERT_PASS }}
Expand Down Expand Up @@ -470,7 +474,7 @@ jobs:
run: make invest_autotest

- name: Tar the workspace to preserve permissions (macOS)
if: failure() && matrix.os == 'macos-latest'
if: failure() && matrix.os == 'macos-13'
run: tar -cvf ${{ matrix.workspace-path}} ${{ github.workspace }}

- name: Upload workspace on failure
Expand Down
8 changes: 6 additions & 2 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,12 @@
.. :changelog:
Unreleased Changes
------------------
..
Unreleased Changes
------------------
3.14.2 (2024-05-29)
-------------------
* General
* Validation now covers file paths contained in CSVs. CSV validation
will fail if the files listed in a CSV fail to validate.
Expand Down

0 comments on commit c8cdd88

Please sign in to comment.