Skip to content

Commit c233676

Browse files
rtirti
authored
Merge branch 'main' into wdqs-separate-concept-uri
2 parents 8bce531 + 3524ddc commit c233676

18 files changed

+101
-25
lines changed

‎.github/workflows/build_publish_image_release.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ on:
99
- 'wdqs-frontend@*'
1010
- 'wdqs-proxy@*'
1111
- 'wikibase@*'
12+
branches-ignore:
13+
- '**' # weird workaround to trigger on multiple tags for a single commit
1214

1315
permissions:
1416
contents: write
@@ -19,17 +21,18 @@ jobs:
1921
runs-on: ubuntu-latest
2022

2123
steps:
22-
- name: Extract imageName and confirm it is a valid semantic version tag
24+
- name: Extract image name and confirm it is a valid semantic version tag
2325
id: extract_tag
2426
run: |
27+
set -x # show commands
28+
2529
# Extract the tag name
2630
TAG_NAME=$(echo ${{ github.ref }} | sed 's/refs\/tags\///')
2731
2832
# Use regex to extract the imageName before the @ and confirm the version is valid semver version tag
2933
if [[ "$TAG_NAME" =~ ^([^@]+)@([0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?)$ ]]; then
30-
# Sets and passes the imageName output from this step, which is used in the subsequent step
31-
# e.g. `steps.extract_tag.outputs.imageName` gets set to "wikibase" matched from "[email protected]")
32-
echo "{imageName}=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
34+
# Store image name in environment for later steps
35+
echo "IMAGE_NAME=${BASH_REMATCH[1]}" >> $GITHUB_ENV
3336
else
3437
echo "Tag does not match the pattern {imageName}@{semantic-version}"
3538
exit 1
@@ -52,7 +55,4 @@ jobs:
5255
set -e # abort on error
5356
set -x # show commands
5457
55-
git config --global user.name 'wikibase suite github actions bot'
56-
git config --global user.email '[email protected]'
57-
58-
./nx release publish -p ${{ steps.extract_tag.outputs.imageName }}
58+
./nx release publish -p $IMAGE_NAME

‎.github/workflows/create_release.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,13 @@ jobs:
4242
with:
4343
github_token: ${{ secrets.GITHUB_TOKEN }}
4444

45-
- uses: docker/login-action@v3
46-
with:
47-
# implicitly docker hub
48-
username: wmdetravisbot
49-
password: ${{ secrets.WBS_PUBLISH_TOKEN }}
50-
5145
- name: Create release
5246
run: |
5347
set -e # abort on error
5448
set -x # show commands
5549
56-
git config --global user.name 'wikibase suite github actions bot'
57-
git config --global user.email 'wikibase-suite-[email protected]'
50+
git config --global user.name 'wikibase-suite-bot'
51+
git config --global user.email 'wikibase-suite-[email protected]'
5852
5953
if [ "${{ inputs.dry_run }}" == "true" ]; then
6054
DRY_RUN_FLAG="--dry-run"

‎build/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ IMAGE_NAME=$(jq -r '.name' package.json)
7676

7777
# publish to Dockerhub
7878
if [ "$PUBLISH" == true ]; then
79-
IMAGE_REGISTRY=dockerhub.io
79+
# IMAGE_REGISTRY implies dockerhub if empty
8080
IMAGE_NAMESPACE=wikibase
8181
# build/test in CI
8282
elif [ "$GITHUB_ACTIONS" == true ]; then

‎build/elasticsearch/CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## **[email protected]** (2024-10-09)
2+
3+
### 📖 Documentation
4+
5+
- Switch from `.example.com` to `.example`

‎build/elasticsearch/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "elasticsearch",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"nx": {
55
"targets": {
66
"lint": {},

‎build/quickstatements/CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## **[email protected]** (2024-10-09)
2+
3+
### 📖 Documentation
4+
5+
- Switch from `.example.com` to `.example`

‎build/quickstatements/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "quickstatements",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"nx": {
55
"targets": {
66
"lint": {},

‎build/wdqs-frontend/CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
## **[email protected]** (2024-10-09)
2+
3+
### 📖 Documentation
4+
5+
- Switch from `.example.com` to `.example`
6+
7+
### 🩹 Fixes
8+
9+
- Link to Query Builder now points to the source code repository ([#664](https://github.com/wmde/wikibase-release-pipeline/issues/664))

‎build/wdqs-frontend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wdqs-frontend",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"nx": {
55
"targets": {
66
"lint": {},

‎build/wdqs-proxy/CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## **[email protected]** (2024-10-09)
2+
3+
### 📖 Documentation
4+
5+
- Switch from `.example.com` to `.example`

‎build/wdqs-proxy/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wdqs-proxy",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"nx": {
55
"targets": {
66
"lint": {},

‎build/wdqs/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## **[email protected]** (2024-10-09)
2+
3+
### 📖 Documentation
4+
5+
- Switch from `.example.com` to `.example`
6+
- Add comments in "Updater keeps restarting" FAQ entry
7+
- Correct typos

‎build/wdqs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wdqs",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"nx": {
55
"targets": {
66
"lint": {},

‎build/wikibase/CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
## **[email protected]** (2024-10-09)
2+
3+
### 📖 Documentation
4+
5+
- Link to MediaWiki bundled extensions
6+
- Switch from `.example.com` to `.example`
7+
8+
### 🏡 Chore
9+
10+
- Removes re-installation of extensions already packaged with MediaWiki (ConfirmEdit, Nuke, Scribunto, SyntaxHighlight_Geshi, VisualEditor)
11+
- Updates Wikibase EDTF extension

‎build/wikibase/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wikibase",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"nx": {
55
"targets": {
66
"lint": {},

‎deploy/CHANGELOG.md

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
## **[email protected]** (2024-10-09)
2+
3+
### 🩹 Fixes
4+
5+
- `*_PUBLIC_HOST` URLs default to `.example` TLD from `example.com` ([T372455](https://phabricator.wikimedia.org/T372455))
6+
- Removes published ports for wikibase, quickstatements, and wdqs-frontend services ([T372455](https://phabricator.wikimedia.org/T372455))
7+
- Wikibase waits for elasticsearch service to be up ([T371162](https://phabricator.wikimedia.org/T371162))
8+
9+
### 📖 Documentation
10+
11+
- Do not use `--wait` in `docker compose up` in order to see logs
12+
- Link to WDQS updater crash FAQ entry
13+
- Corrected typos
14+
15+
### 🏡 Chore
16+
17+
- Adds default Traefik LetsEncrypt configuration for services

‎deploy/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "deploy",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"nx": {
55
"targets": {
66
"lint": {},

‎nx.json

+24-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,20 @@
88
}
99
},
1010
"release": {
11+
"conventionalCommits": {
12+
"types": {
13+
"build": true,
14+
"chore": true,
15+
"ci": true,
16+
"docs": true,
17+
"feat": true,
18+
"fix": true,
19+
"perf": true,
20+
"refactor": true,
21+
"style": true,
22+
"test": true
23+
}
24+
},
1125
"groups": {
1226
"images": {
1327
"projects": [ "build/*" ]
@@ -21,7 +35,16 @@
2135
"conventionalCommits": true
2236
},
2337
"changelog": {
24-
"projectChangelogs": true
38+
"projectChangelogs": {
39+
"renderOptions": {
40+
"authors": false
41+
}
42+
},
43+
"workspaceChangelog": {
44+
"renderOptions": {
45+
"authors": false
46+
}
47+
}
2548
}
2649
},
2750
"targetDefaults": {

0 commit comments

Comments
 (0)