Skip to content

Commit b16bac9

Browse files
authored
Merge branch 'develop' into shay/account_suspension_pt_2
2 parents 4b4180b + adeedb7 commit b16bac9

File tree

159 files changed

+5764
-1196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+5764
-1196
lines changed

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
7373
- name: Build and push all platforms
7474
id: build-and-push
75-
uses: docker/build-push-action@v5
75+
uses: docker/build-push-action@v6
7676
with:
7777
push: true
7878
labels: |

.github/workflows/docs-pr-netlify.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# There's a 'download artifact' action, but it hasn't been updated for the workflow_run action
1515
# (https://github.com/actions/download-artifact/issues/60) so instead we get this mess:
1616
- name: 📥 Download artifact
17-
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4
17+
uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11 # v6
1818
with:
1919
workflow: docs-pr.yaml
2020
run_id: ${{ github.event.workflow_run.id }}

.github/workflows/release-artifacts.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
runs-on: ${{ matrix.os }}
103103
strategy:
104104
matrix:
105-
os: [ubuntu-20.04, macos-11]
105+
os: [ubuntu-20.04, macos-12]
106106
arch: [x86_64, aarch64]
107107
# is_pr is a flag used to exclude certain jobs from the matrix on PRs.
108108
# It is not read by the rest of the workflow.
@@ -112,9 +112,9 @@ jobs:
112112
exclude:
113113
# Don't build macos wheels on PR CI.
114114
- is_pr: true
115-
os: "macos-11"
115+
os: "macos-12"
116116
# Don't build aarch64 wheels on mac.
117-
- os: "macos-11"
117+
- os: "macos-12"
118118
arch: aarch64
119119
# Don't build aarch64 wheels on PR CI.
120120
- is_pr: true
@@ -130,7 +130,7 @@ jobs:
130130
python-version: "3.x"
131131

132132
- name: Install cibuildwheel
133-
run: python -m pip install cibuildwheel==2.16.2
133+
run: python -m pip install cibuildwheel==2.19.1
134134

135135
- name: Set up QEMU to emulate aarch64
136136
if: matrix.arch == 'aarch64'

.github/workflows/tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,9 @@ jobs:
479479
volumes:
480480
- ${{ github.workspace }}:/src
481481
env:
482+
# If this is a pull request to a release branch, use that branch as default branch for sytest, else use develop
483+
# This works because the release script always create a branch on the sytest repo with the same name as the release branch
484+
SYTEST_DEFAULT_BRANCH: ${{ startsWith(github.base_ref, 'release-') && github.base_ref || 'develop' }}
482485
SYTEST_BRANCH: ${{ github.head_ref }}
483486
POSTGRES: ${{ matrix.job.postgres && 1}}
484487
MULTI_POSTGRES: ${{ (matrix.job.postgres == 'multi-postgres') || '' }}

CHANGES.md

Lines changed: 86 additions & 0 deletions

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.rst

Lines changed: 50 additions & 25 deletions

changelog.d/17083.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/17147.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/17164.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)