Skip to content

Commit

Permalink
Update GH actions for official 1.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
LukeTowers committed Jul 15, 2022
1 parent 74c3bbd commit e565728
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/workflows/code-quality.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
branches:
- 1.0
- 1.1
- 1.2
- develop

jobs:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- 1.0
- 1.1
- 1.2
- develop
pull_request:

Expand Down Expand Up @@ -78,7 +79,7 @@ jobs:

- name: Switch library dependency (develop)
if: github.ref == 'refs/heads/develop' || github.base_ref == 'develop'
run: php ./.github/workflows/utilities/library-switcher "dev-develop as 1.1"
run: php ./.github/workflows/utilities/library-switcher "dev-develop as 1.2"

- name: Switch library dependency (1.0)
if: github.head_ref == '1.0' || github.ref == 'refs/heads/1.0' || github.base_ref == '1.0'
Expand All @@ -89,8 +90,8 @@ jobs:
run: php ./.github/workflows/utilities/library-switcher "1.1.x-dev as 1.1"

- name: Switch library dependency (1.2)
if: github.head_ref == 'wip/1.2' || github.ref == 'refs/heads/wip/1.2' || github.base_ref == 'wip/1.2'
run: php ./.github/workflows/utilities/library-switcher "dev-wip/1.2 as 1.2"
if: github.head_ref == '1.2' || github.ref == 'refs/heads/1.2' || github.base_ref == '1.2'
run: php ./.github/workflows/utilities/library-switcher "1.2.x-dev as 1.2"

- name: Setup dependency cache
id: composercache
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
},
"require": {
"php": "^8.0.2",
"winter/storm": "dev-wip/1.2 as 1.2",
"winter/wn-system-module": "dev-wip/1.2",
"winter/wn-backend-module": "dev-wip/1.2",
"winter/wn-cms-module": "dev-wip/1.2",
"winter/storm": "dev-develop as 1.2",
"winter/wn-system-module": "dev-develop",
"winter/wn-backend-module": "dev-develop",
"winter/wn-cms-module": "dev-develop",
"laravel/framework": "^9.1",
"wikimedia/composer-merge-plugin": "~2.0.1"
},
Expand Down

0 comments on commit e565728

Please sign in to comment.