Skip to content

Commit

Permalink
Merge branch 'main' into wdqs-separate-concept-uri
Browse files Browse the repository at this point in the history
  • Loading branch information
rti authored Oct 21, 2024
2 parents 8bce531 + 3524ddc commit c233676
Show file tree
Hide file tree
Showing 18 changed files with 101 additions and 25 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build_publish_image_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ on:
- 'wdqs-frontend@*'
- 'wdqs-proxy@*'
- 'wikibase@*'
branches-ignore:
- '**' # weird workaround to trigger on multiple tags for a single commit

permissions:
contents: write
Expand All @@ -19,17 +21,18 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Extract imageName and confirm it is a valid semantic version tag
- name: Extract image name and confirm it is a valid semantic version tag
id: extract_tag
run: |
set -x # show commands
# Extract the tag name
TAG_NAME=$(echo ${{ github.ref }} | sed 's/refs\/tags\///')
# Use regex to extract the imageName before the @ and confirm the version is valid semver version tag
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
# Sets and passes the imageName output from this step, which is used in the subsequent step
# e.g. `steps.extract_tag.outputs.imageName` gets set to "wikibase" matched from "[email protected]")
echo "{imageName}=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
# Store image name in environment for later steps
echo "IMAGE_NAME=${BASH_REMATCH[1]}" >> $GITHUB_ENV
else
echo "Tag does not match the pattern {imageName}@{semantic-version}"
exit 1
Expand All @@ -52,7 +55,4 @@ jobs:
set -e # abort on error
set -x # show commands
git config --global user.name 'wikibase suite github actions bot'
git config --global user.email '[email protected]'
./nx release publish -p ${{ steps.extract_tag.outputs.imageName }}
./nx release publish -p $IMAGE_NAME
10 changes: 2 additions & 8 deletions .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,13 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}

- uses: docker/login-action@v3
with:
# implicitly docker hub
username: wmdetravisbot
password: ${{ secrets.WBS_PUBLISH_TOKEN }}

- name: Create release
run: |
set -e # abort on error
set -x # show commands
git config --global user.name 'wikibase suite github actions bot'
git config --global user.email 'wikibase-suite-[email protected]'
git config --global user.name 'wikibase-suite-bot'
git config --global user.email 'wikibase-suite-[email protected]'
if [ "${{ inputs.dry_run }}" == "true" ]; then
DRY_RUN_FLAG="--dry-run"
Expand Down
2 changes: 1 addition & 1 deletion build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ IMAGE_NAME=$(jq -r '.name' package.json)

# publish to Dockerhub
if [ "$PUBLISH" == true ]; then
IMAGE_REGISTRY=dockerhub.io
# IMAGE_REGISTRY implies dockerhub if empty
IMAGE_NAMESPACE=wikibase
# build/test in CI
elif [ "$GITHUB_ACTIONS" == true ]; then
Expand Down
5 changes: 5 additions & 0 deletions build/elasticsearch/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## **[email protected]** (2024-10-09)

### 📖 Documentation

- Switch from `.example.com` to `.example`
2 changes: 1 addition & 1 deletion build/elasticsearch/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "elasticsearch",
"version": "1.0.0",
"version": "1.0.1",
"nx": {
"targets": {
"lint": {},
Expand Down
5 changes: 5 additions & 0 deletions build/quickstatements/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## **[email protected]** (2024-10-09)

### 📖 Documentation

- Switch from `.example.com` to `.example`
2 changes: 1 addition & 1 deletion build/quickstatements/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "quickstatements",
"version": "1.0.0",
"version": "1.0.1",
"nx": {
"targets": {
"lint": {},
Expand Down
9 changes: 9 additions & 0 deletions build/wdqs-frontend/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## **[email protected]** (2024-10-09)

### 📖 Documentation

- Switch from `.example.com` to `.example`

### 🩹 Fixes

- Link to Query Builder now points to the source code repository ([#664](https://github.com/wmde/wikibase-release-pipeline/issues/664))
2 changes: 1 addition & 1 deletion build/wdqs-frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wdqs-frontend",
"version": "1.0.0",
"version": "1.0.1",
"nx": {
"targets": {
"lint": {},
Expand Down
5 changes: 5 additions & 0 deletions build/wdqs-proxy/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## **[email protected]** (2024-10-09)

### 📖 Documentation

- Switch from `.example.com` to `.example`
2 changes: 1 addition & 1 deletion build/wdqs-proxy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wdqs-proxy",
"version": "1.0.0",
"version": "1.0.1",
"nx": {
"targets": {
"lint": {},
Expand Down
7 changes: 7 additions & 0 deletions build/wdqs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## **[email protected]** (2024-10-09)

### 📖 Documentation

- Switch from `.example.com` to `.example`
- Add comments in "Updater keeps restarting" FAQ entry
- Correct typos
2 changes: 1 addition & 1 deletion build/wdqs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wdqs",
"version": "1.0.0",
"version": "1.0.1",
"nx": {
"targets": {
"lint": {},
Expand Down
11 changes: 11 additions & 0 deletions build/wikibase/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## **[email protected]** (2024-10-09)

### 📖 Documentation

- Link to MediaWiki bundled extensions
- Switch from `.example.com` to `.example`

### 🏡 Chore

- Removes re-installation of extensions already packaged with MediaWiki (ConfirmEdit, Nuke, Scribunto, SyntaxHighlight_Geshi, VisualEditor)
- Updates Wikibase EDTF extension
2 changes: 1 addition & 1 deletion build/wikibase/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wikibase",
"version": "3.0.0",
"version": "3.0.1",
"nx": {
"targets": {
"lint": {},
Expand Down
17 changes: 17 additions & 0 deletions deploy/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
## **[email protected]** (2024-10-09)

### 🩹 Fixes

- `*_PUBLIC_HOST` URLs default to `.example` TLD from `example.com` ([T372455](https://phabricator.wikimedia.org/T372455))
- Removes published ports for wikibase, quickstatements, and wdqs-frontend services ([T372455](https://phabricator.wikimedia.org/T372455))
- Wikibase waits for elasticsearch service to be up ([T371162](https://phabricator.wikimedia.org/T371162))

### 📖 Documentation

- Do not use `--wait` in `docker compose up` in order to see logs
- Link to WDQS updater crash FAQ entry
- Corrected typos

### 🏡 Chore

- Adds default Traefik LetsEncrypt configuration for services
2 changes: 1 addition & 1 deletion deploy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "deploy",
"version": "3.0.0",
"version": "3.0.1",
"nx": {
"targets": {
"lint": {},
Expand Down
25 changes: 24 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,20 @@
}
},
"release": {
"conventionalCommits": {
"types": {
"build": true,
"chore": true,
"ci": true,
"docs": true,
"feat": true,
"fix": true,
"perf": true,
"refactor": true,
"style": true,
"test": true
}
},
"groups": {
"images": {
"projects": [ "build/*" ]
Expand All @@ -21,7 +35,16 @@
"conventionalCommits": true
},
"changelog": {
"projectChangelogs": true
"projectChangelogs": {
"renderOptions": {
"authors": false
}
},
"workspaceChangelog": {
"renderOptions": {
"authors": false
}
}
}
},
"targetDefaults": {
Expand Down

0 comments on commit c233676

Please sign in to comment.