Skip to content

Commit 71a1889

Browse files
committed
Revert unrelated change.
1 parent b6818c0 commit 71a1889

2 files changed

Lines changed: 21 additions & 6 deletions

File tree

.github/workflows/code_test_and_deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
tags:
88
- 'v*'
99
pull_request:
10+
types: [opened, synchronize, reopened, ready_for_review]
1011

1112
schedule:
1213
# Cron runs on the 1st and 15th of every month.
@@ -20,7 +21,6 @@ jobs:
2021
- uses: neuroinformatics-unit/actions/lint@v2
2122

2223
test:
23-
if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
2424
needs: [linting]
2525
name: ${{ matrix.os }} py${{ matrix.python-version }}
2626
runs-on: ${{ matrix.os }}

.github/workflows/run_secure_tests_on_forked_pr.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,38 @@ jobs:
1717
permissions:
1818
contents: read
1919

20+
strategy:
21+
fail-fast: true
22+
matrix:
23+
os: ${{ fromJson(github.event_name == 'schedule'
24+
&& '["ubuntu-latest","windows-latest","macos-14", "macos-13"]'
25+
|| '["ubuntu-latest","windows-latest","macos-latest"]') }}
26+
python-version: ${{ fromJson(github.event_name == 'schedule'
27+
&& '["3.9","3.10","3.11","3.12","3.13"]'
28+
|| '["3.9","3.13"]') }}
29+
2030
steps:
2131
- name: Checkout PR merge ref
22-
uses: actions/checkout@v4
32+
- uses: actions/checkout@v5
2333
with:
2434
ref: refs/pull/${{ github.event.pull_request.number }}/merge
2535

36+
- uses: actions/checkout@v5
2637
- name: Set up Conda
2738
uses: conda-incubator/setup-miniconda@v3
2839
with:
29-
python-version: 3.12
40+
python-version: ${{ matrix.python-version }}
41+
auto-update-conda: true
3042
channels: conda-forge
31-
activate-environment: datashuttle-test
43+
activate-environment: "datashuttle-test"
3244

33-
- name: Install deps
45+
- name: Install rclone
3446
run: |
3547
conda activate datashuttle-test
36-
conda install -c conda-forge -y rclone
48+
conda install -c conda-forge rclone
49+
50+
- name: Install datashuttle from repo
51+
run: |
3752
python -m pip install --upgrade pip
3853
pip install .[dev]
3954

0 commit comments

Comments
 (0)