Skip to content

Commit

Permalink
Merge branch 'python' of ssh://github.com/espressomd/espresso into le…
Browse files Browse the repository at this point in the history
…_osc_decay
  • Loading branch information
RudolfWeeber committed Jul 31, 2024
2 parents c83095d + 5fb7a80 commit 43309ba
Show file tree
Hide file tree
Showing 607 changed files with 22,556 additions and 14,134 deletions.
3 changes: 2 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ Checks: |
-bugprone-implicit-widening-of-multiplication-result,
-bugprone-macro-parentheses,
-bugprone-reserved-identifier,
-bugprone-switch-missing-default-case,
-bugprone-unchecked-optional-access,
clang-analyzer-alpha.*,
modernize-deprecated-headers,
modernize-make-shared,
Expand Down Expand Up @@ -41,7 +43,6 @@ Checks: |
readability-function-size'
WarningsAsErrors: '*,-clang-analyzer-core.StackAddrEscapeBase,-clang-analyzer-optin.mpi.MPI-Checker'
HeaderFilterRegex: '.*'
AnalyzeTemporaryDtors: false
FormatStyle: none
User: espresso
CheckOptions:
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build_and_check/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ runs:
- run: |
brew install boost boost-mpi fftw
brew install hdf5-mpi
pip3 install -c requirements.txt numpy "cython<3.0" h5py scipy
pip3 install -c requirements.txt "cython<3.0" numpy scipy h5py packaging
shell: bash
if: runner.os == 'macOS'
- run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Install pandoc
uses: r-lib/actions/setup-pandoc@v2
- name: Setup SSH agent
uses: webfactory/ssh-agent@v0.7.0
uses: webfactory/ssh-agent@v0.9.0
with:
ssh-private-key: ${{ secrets.GH_PAGES_SSH_PRIVATE_KEY }}
- name: Checkout
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/push_pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
macos:
runs-on: macos-12
runs-on: macos-13
if: ${{ github.repository == 'espressomd/espresso' }}
steps:
- name: Checkout
Expand All @@ -20,22 +20,22 @@ jobs:
key: macos
save: ${{ github.ref == 'refs/heads/python' }}
- name: Setup Python environment
uses: actions/setup-python@v4.3.1
uses: actions/setup-python@v5.1.0
with:
python-version: '3.9'
python-version: '3.12'
- name: Get runner specifications
run: system_profiler SPHardwareDataType
- name: Build and check
uses: ./.github/actions/build_and_check
env:
build_procs: 3
check_procs: 3
build_procs: 4
check_procs: 4
with_ccache: 'true'

debian:
runs-on: ubuntu-latest
container:
image: ghcr.io/espressomd/docker/debian:339903979196fd7e72127f2cb5bfb27759d129f9-base-layer
image: ghcr.io/espressomd/docker/debian:f7f8ef2c0ca93c67aa16b9f91785492fb04ecc1b-base-layer
credentials:
username: ${{ github.actor }}
password: ${{ secrets.github_token }}
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.repository == 'espressomd/espresso' }}
container:
image: ghcr.io/espressomd/docker/ubuntu-wo-dependencies:339903979196fd7e72127f2cb5bfb27759d129f9-base-layer
image: ghcr.io/espressomd/docker/ubuntu-wo-dependencies:f7f8ef2c0ca93c67aa16b9f91785492fb04ecc1b-base-layer
credentials:
username: ${{ github.actor }}
password: ${{ secrets.github_token }}
Expand Down
Loading

0 comments on commit 43309ba

Please sign in to comment.