Skip to content

Commit 51ecc70

Browse files
authored
Merge branch 'main' into update-release-workflow
2 parents 0ac5c78 + f798903 commit 51ecc70

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

.github/workflows/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
npm-update:
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-24.04
99
if: ${{ github.actor == 'dependabot[bot]' }}
1010
permissions:
1111
contents: write
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v5
1515
- uses: actions/setup-node@v4
1616
with:
17-
node-version: 18
17+
node-version: 24
1818
cache: npm
1919
- name: Checkout PR
2020
run: gh pr checkout ${{ github.event.pull_request.number }}

.github/workflows/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
os: [ubuntu-22.04, ubuntu-24.04]
21-
version: ['latest', '1.24.0']
20+
os: [ubuntu-24.04, ubuntu-24.04-arm]
21+
version: ['latest', '1.24.7']
2222
steps:
2323
- uses: actions/checkout@v5
2424
- uses: ./
@@ -28,10 +28,10 @@ jobs:
2828
version: ${{ matrix.version }}
2929
- name: ddev version
3030
run: |
31-
if [[ ${{ matrix.version }} == '1.24.0' ]]; then
32-
test "$(ddev --version)" == 'ddev version v1.24.0'
31+
if [[ ${{ matrix.version }} == '1.24.7' ]]; then
32+
test "$(ddev --version)" == 'ddev version v1.24.7'
3333
else
34-
test "$(ddev --version)" != 'ddev version v1.24.0'
34+
test "$(ddev --version)" != 'ddev version v1.24.7'
3535
fi
3636
- name: ddev stopped
3737
run: |

.github/workflows/update-main-version.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ on:
99
- v*
1010

1111
jobs:
12-
update-version:
13-
runs-on: ubuntu-latest
12+
tag:
13+
runs-on: ubuntu-24.04
14+
permissions:
15+
contents: write
1416
steps:
1517
- uses: actions/checkout@v5
1618
with:

0 commit comments

Comments
 (0)