Skip to content

Commit 90869ca

Browse files
author
Charlles Abreu
authored
Runs GH Actions on Apple Silicon MacOS runner (#9)
* Runs MacOS workflow on appe-silicon-based runner * Updated conda build workflow * Changed runner choices
1 parent ba96779 commit 90869ca

File tree

6 files changed

+18
-17
lines changed

6 files changed

+18
-17
lines changed

.github/workflows/Conda.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@ jobs:
1515
strategy:
1616
matrix:
1717
include:
18-
- platform: linux-64
19-
os: ubuntu-latest
18+
- os: ubuntu-latest
19+
platform: linux-64
2020

21-
- platform: osx-64
22-
os: macos-latest
21+
- os: macos-latest
22+
platform: osx-64
23+
24+
- os: macos-latest
25+
platform: osx-arm64
2326

2427
steps:
2528
- uses: actions/checkout@v3
@@ -50,7 +53,11 @@ jobs:
5053
conda mambabuild . --no-anaconda-upload --variants "{platform: ${{ matrix.platform }}}" --output-folder $outdir
5154
echo "::endgroup::"
5255
echo "::group::Uploading packages to mdtools conda channel"
53-
export ANACONDA_API_TOKEN=${{ secrets.ANACONDA_TOKEN }}
54-
PACKAGES=$(find $outdir -name openmm-cpp-forces-*.tar.bz2)
55-
anaconda upload --user mdtools --force --label main $PACKAGES
56+
if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
57+
echo "Deployment is deactivated in pull requests"
58+
else
59+
export ANACONDA_API_TOKEN=${{ secrets.ANACONDA_TOKEN }}
60+
PACKAGES=$(find $outdir -name openmm-cpp-forces-*.tar.bz2)
61+
anaconda upload --user mdtools --force --label main $PACKAGES
62+
fi
5663
echo "::endgroup::"

.github/workflows/Docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
include:
19-
- os: ubuntu-20.04
19+
- os: ubuntu-latest
2020
python-version: "3.11"
2121
openmm-version: "8.1"
2222
gcc-version: "13"

.github/workflows/Linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
matrix:
2121
include:
2222
# Oldest supported versions
23-
- os: ubuntu-20.04
23+
- os: ubuntu-latest
2424
python-version: "3.9"
2525
openmm-version: "8.1"
2626
gcc-version: "9"
2727

2828
# Latest supported versions
29-
- os: ubuntu-20.04
29+
- os: ubuntu-latest
3030
python-version: "3.11"
3131
openmm-version: "8.1"
3232
gcc-version: "13"

.github/workflows/MacOS.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,10 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
include:
22-
# Oldest supported versions
23-
- os: macos-11
22+
- os: macos-latest
2423
python-version: "3.9"
2524
openmm-version: "8.1"
2625

27-
# Latest supported versions
28-
- os: macos-11
29-
python-version: "3.11"
30-
openmm-version: "8.1"
31-
3226
steps:
3327
- name: "Check out"
3428
uses: actions/checkout@v3

0 commit comments

Comments
 (0)