Skip to content

Commit 6d42708

Browse files
committed
Fix reset to develop branch
1 parent 1f4138d commit 6d42708

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/ci-meson.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ permissions:
1919

2020
jobs:
2121
test:
22-
name: Conda (${{ matrix.os }}, Python ${{ matrix.python }})
22+
name: Conda (${{ matrix.os }}, Python ${{ matrix.python }}, ${{ matrix.tests }})
2323
runs-on: ${{ matrix.os }}-latest
2424

2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
os: [ubuntu]
28+
os: ['ubuntu']
2929
python: ['3.11', '3.12']
3030
tests: ['all']
3131
include:
32-
- os: ubuntu
33-
python: 3.12
34-
tests: new
32+
- os: 'ubuntu'
33+
python: '3.12'
34+
tests: 'new'
3535

3636
steps:
3737
- uses: actions/checkout@v4
@@ -48,7 +48,7 @@ jobs:
4848
# List remotes (for debugging)
4949
git remote -v
5050
# Reset the branch to develop
51-
git reset --soft upstream/develop
51+
git reset --soft origin/develop
5252
# Show uncommitted changes
5353
git status
5454

0 commit comments

Comments
 (0)