Skip to content

Commit a7613e9

Browse files
az-digital/az_quickstart#4446: Prepare az-quickstart-dev metapackage repo for multiple dev branches (#124)
* az-digital/az_quickstart#4446: Changes needed to support two development branches in az-quickstart-dev metapackage --------- Co-authored-by: Chris Green <chrisgreen@arizona.edu>
1 parent dbb241e commit a7613e9

4 files changed

Lines changed: 40 additions & 9 deletions

File tree

.github/dependabot.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@ version: 2
22
updates:
33
- package-ecosystem: "composer"
44
directory: "/"
5+
target-branch: "main"
56
schedule:
67
interval: "daily"
7-
reviewers:
8-
- "az-digital/developers"
8+
labels:
9+
- "3.x only"
10+
- package-ecosystem: "composer"
11+
directory: "/"
12+
target-branch: "1.x"
13+
schedule:
14+
interval: "daily"
15+
labels:
16+
- "1.x only"

.github/workflows/pull-request-checks.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
pull_request:
44
branches:
55
- main
6+
- 1.x
67

78
jobs:
89
composer:
@@ -12,22 +13,20 @@ jobs:
1213
- name: Set up PHP
1314
uses: shivammathur/setup-php@v2
1415
with:
15-
php-version: '8.2'
16+
php-version: '8.3'
1617
extensions: mbstring, intl
1718
tools: composer:v2
1819

1920
- name: Checkout branch
2021
uses: actions/checkout@v4
21-
with:
22-
ref: ${{ github.head_ref }}
2322

2423
- name: Check for matching branch in Quickstart repo
2524
id: check-quickstart-branch
2625
run: |
2726
if [ $(git ls-remote --heads https://github.com/az-digital/az_quickstart.git ${{ github.head_ref }} | wc -l) = 1 ]; then
2827
echo "QUICKSTART_BRANCH_NAME=${{ github.head_ref }}" >> ${GITHUB_ENV}
2928
else
30-
echo "QUICKSTART_BRANCH_NAME=main" >> ${GITHUB_ENV}
29+
echo "QUICKSTART_BRANCH_NAME=${{ github.base_ref }}" >> ${GITHUB_ENV}
3130
fi
3231
3332
- name: Check for matching branch in scaffolding repo
@@ -36,7 +35,7 @@ jobs:
3635
if [ $(git ls-remote --heads https://github.com/az-digital/az-quickstart-scaffolding.git ${{ github.head_ref }} | wc -l) = 1 ]; then
3736
echo "SCAFFOLDING_BRANCH_NAME=${{ github.head_ref }}" >> ${GITHUB_ENV}
3837
else
39-
echo "SCAFFOLDING_BRANCH_NAME=main" >> ${GITHUB_ENV}
38+
echo "SCAFFOLDING_BRANCH_NAME=${{ github.base_ref }}" >> ${GITHUB_ENV}
4039
fi
4140
4241
- name: Checkout scaffolding repo

README.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
# az-quickstart-dev
2-
Composer require-dev dependencies for AZ Quickstart projects.
2+
3+
Composer `require-dev` dependencies for Arizona Quickstart projects.
4+
5+
## No Tagged Releases
6+
7+
This repository does **not** use tagged releases.
8+
Instead, it relies on **[Composer branch aliases](https://getcomposer.org/doc/articles/aliases.md)** defined on specific release branches (e.g., `1.x`, `3.x`).
9+
10+
The `main` branch can be used with Composer in one of the following ways:
11+
12+
```json
13+
"az-digital/az-quickstart-dev": "3.x-dev"
14+
```
15+
16+
or:
17+
18+
```json
19+
"az-digital/az-quickstart-dev": "dev-main"
20+
```
21+
22+
For Arizona Quickstart 2.14.x and below, use:
23+
24+
```json
25+
"az-digital/az-quickstart-dev": "1.x-dev"
26+
```
327

428
**This package includes the following contrib development modules.**
529

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
},
3636
"extra": {
3737
"branch-alias": {
38-
"dev-main": "1.x-dev"
38+
"dev-main": "3.x-dev"
3939
}
4040
}
4141
}

0 commit comments

Comments
 (0)