Skip to content

Commit cbceb60

Browse files
lorenjohnsonlorenjohnson
committed
Merge branch 'main' into test-before-release
2 parents 6737f13 + dbcc8f5 commit cbceb60

File tree

84 files changed

+1077
-1117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1077
-1117
lines changed

‎.github/actions/pull-ghcr/action.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ runs:
1414
"elasticsearch"
1515
"wdqs"
1616
"wdqs-frontend"
17-
"wdqs-proxy"
1817
"quickstatements"
1918
)
2019

‎.github/actions/setup-environment/action.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ inputs:
44
github_token:
55
description: token to access GHCR
66
required: true
7+
dockerhub_token:
8+
description: token to access dockerhub
9+
required: true
710

811
runs:
912
using: "composite"
@@ -15,7 +18,7 @@ runs:
1518
- uses: actions/setup-node@v4
1619
with:
1720
node-version: 20
18-
cache: 'pnpm'
21+
cache: "pnpm"
1922

2023
- name: Install Javascript dependencies (PNPM)
2124
shell: bash
@@ -30,6 +33,13 @@ runs:
3033
with:
3134
platforms: linux/amd64,linux/arm64
3235

36+
- name: Login to Dockerhub Container Registry (to increase rate limit)
37+
uses: docker/login-action@v3
38+
with:
39+
# implicitly docker hub
40+
username: wmdetravisbot
41+
password: ${{ inputs.dockerhub_token }}
42+
3343
- name: Login to GitHub Container Registry
3444
uses: docker/login-action@v3
3545
with:

‎.github/config.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Replies to people who have created an issue on this repository for the first time.
2+
3+
newIssueWelcomeComment: |
4+
5+
Hi! 👋
6+
7+
Thank you so much for opening your first issue with us! 🎉 We are thrilled to have you here and really appreciate you taking the time to contribute.
8+
9+
Your input is valuable in making our project better for everyone. If you have any questions, do not hesitate to ask. We're here to help and support you along the way!
10+
11+
Here are a few links to get you started:
12+
* [Documentation](https://github.com/wmde/wikibase-release-pipeline/blob/main/deploy/README.md)
13+
* [Telegram Community Channel](https://t.me/+WBsf9-C9KPuMZCDT)
14+
* [Phabricator Tickets](https://phabricator.wikimedia.org/project/board/5755/)
15+
* [Contact form](https://wikiba.se/contact/)
16+
* [Wikibase Mailing List](https://lists.wikimedia.org/postorius/lists/wikibaseug.lists.wikimedia.org/?source=post_page---------------------------)
17+
* [Wikibase Suite Team Mail](wikibase-suite@wikimedia.de)
18+
19+
Looking forward to collaborating with you. We will get back to you on this issue within the next 14 days. 😊
20+
21+
Happy contributing! 🚀
22+
23+
# Replies to people who have created a PR on this repository for the first time.
24+
25+
newPRWelcomeComment: |
26+
27+
Hi! 👋
28+
29+
Thank you so much for submitting your first pull request! 🎉 We are excited to see your contribution and really appreciate the effort you've put in.
30+
31+
Your work helps make our project better, and we are here to support you. If you have any questions or need any guidance, please feel free to reach out. We are all here to help make this process as smooth as possible for you.
32+
33+
Here are a few links you might want to check out:
34+
* [Documentation](https://github.com/wmde/wikibase-release-pipeline/blob/main/deploy/README.md)
35+
* [Telegram Community Channel](https://t.me/+WBsf9-C9KPuMZCDT)
36+
* [Phabricator Tickets](https://phabricator.wikimedia.org/project/board/5755/)
37+
* [Contact form](https://wikiba.se/contact/)
38+
* [Wikibase Mailing List](https://lists.wikimedia.org/postorius/lists/wikibaseug.lists.wikimedia.org/?source=post_page---------------------------)
39+
* [Wikibase Suite Team Mail](wikibase-suite@wikimedia.de)
40+
41+
Looking forward to working with you on this and future contributions! We will get back to you on this PR within the next 14 days.😊
42+
43+
Happy contributing! 🚀
44+
45+
# Replies to people who have merged a PR on this repository for the first time.
46+
47+
firstPRMergeComment: |
48+
49+
Congratulations on merging your first pull request! We hope to see more of your contributions to Wikibase Suite.
50+
51+
* We would love to see you join our community on [Telegram](https://t.me/+WBsf9-C9KPuMZCDT) if you haven't already.
52+
53+
See you very soon in the next contribution 🚀

‎.github/workflows/_build_test.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33

44
jobs:
55
lint:
6-
runs-on: ubuntu-latest
6+
runs-on: ubuntu-24.04
77
timeout-minutes: 30
88

99
steps:
@@ -12,11 +12,12 @@ jobs:
1212
- uses: ./.github/actions/setup-environment
1313
with:
1414
github_token: ${{ secrets.GITHUB_TOKEN }}
15+
dockerhub_token: ${{ secrets.WBS_PUBLISH_TOKEN }}
1516

1617
- run: ./nx lint
1718

1819
build:
19-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-24.04
2021
timeout-minutes: 60
2122

2223
strategy:
@@ -27,7 +28,6 @@ jobs:
2728
- elasticsearch
2829
- wdqs
2930
- wdqs-frontend
30-
- wdqs-proxy
3131
- quickstatements
3232

3333
steps:
@@ -36,13 +36,14 @@ jobs:
3636
- uses: ./.github/actions/setup-environment
3737
with:
3838
github_token: ${{ secrets.GITHUB_TOKEN }}
39+
dockerhub_token: ${{ secrets.WBS_PUBLISH_TOKEN }}
3940

4041
- name: Build and push ${{ matrix.imageName }}
4142
run: ./nx build ${{ matrix.imageName }} --push
4243

4344
test:
4445
needs: build
45-
runs-on: ubuntu-latest
46+
runs-on: ubuntu-24.04
4647
timeout-minutes: 20
4748

4849
strategy:
@@ -55,14 +56,14 @@ jobs:
5556
- quickstatements
5657
- pingback
5758
- elasticsearch
58-
- deploy
5959

6060
steps:
6161
- uses: actions/checkout@v4
6262

6363
- uses: ./.github/actions/setup-environment
6464
with:
6565
github_token: ${{ secrets.GITHUB_TOKEN }}
66+
dockerhub_token: ${{ secrets.WBS_PUBLISH_TOKEN }}
6667

6768
- name: "Pull images from GHCR"
6869
uses: ./.github/actions/pull-ghcr
@@ -84,9 +85,9 @@ jobs:
8485
test-success:
8586
# Post-test CI step - to check all tests succeeded
8687
# Github Branch Protection rules require this to pass to allow merging
87-
runs-on: ubuntu-latest
88+
runs-on: ubuntu-24.04
8889
needs:
8990
- lint
9091
- test
9192
steps:
92-
- run: true
93+
- run: "true"

‎.github/workflows/build_publish_image_release.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
- 'quickstatements@*'
88
- 'wdqs@*'
99
- 'wdqs-frontend@*'
10-
- 'wdqs-proxy@*'
1110
- 'wikibase@*'
1211

1312
# TODO: review permissions
@@ -20,7 +19,7 @@ jobs:
2019
uses: ./.github/workflows/_build_test.yml
2120

2221
extract_tag_and_publish:
23-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-24.04
2423

2524
steps:
2625
- name: Extract image name and confirm it is a valid semantic version tag
@@ -45,12 +44,7 @@ jobs:
4544
- uses: ./.github/actions/setup-environment
4645
with:
4746
github_token: ${{ secrets.GITHUB_TOKEN }}
48-
49-
- uses: docker/login-action@v3
50-
with:
51-
# implicitly docker hub
52-
username: wmdetravisbot
53-
password: ${{ secrets.WBS_PUBLISH_TOKEN }}
47+
dockerhub_token: ${{ secrets.WBS_PUBLISH_TOKEN }}
5448

5549
- name: Build image and push to Dockerhub with release tags
5650
run: |

‎.github/workflows/build_test_main.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ on:
88
jobs:
99
_:
1010
uses: ./.github/workflows/_build_test.yml
11+
secrets: inherit

‎.github/workflows/build_test_pr.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ on:
1212
jobs:
1313
_:
1414
uses: ./.github/workflows/_build_test.yml
15+
secrets: inherit

‎.github/workflows/create_release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ on:
1414
- quickstatements
1515
- wdqs
1616
- wdqs-frontend
17-
- wdqs-proxy
1817
- wikibase
1918
- All projects with unreleased changes
2019
dry_run:
@@ -30,7 +29,7 @@ permissions:
3029

3130
jobs:
3231
release:
33-
runs-on: ubuntu-latest
32+
runs-on: ubuntu-24.04
3433

3534
steps:
3635
- uses: actions/checkout@v4
@@ -42,6 +41,7 @@ jobs:
4241
- uses: ./.github/actions/setup-environment
4342
with:
4443
github_token: ${{ secrets.GITHUB_TOKEN }}
44+
dockerhub_token: ${{ secrets.WBS_PUBLISH_TOKEN }}
4545

4646
- name: Create release
4747
run: |
@@ -57,7 +57,7 @@ jobs:
5757
DRY_RUN_FLAG=""
5858
fi
5959
60-
if [ "${{ inputs.project_name }}" == "All projects (images and deploy) with unreleased changes" ]; then
60+
if [ "${{ inputs.project_name }}" == "All projects with unreleased changes" ]; then
6161
PROJECT_ARG=""
6262
else
6363
PROJECT_ARG="-p ${{ inputs.project_name }}"

‎.gitignore‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@ pnpm
66
.direnv
77

88
local.env
9+
**/.env
910

1011
deploy/log
11-
deploy/.env
12-
deploy/config/LocalSettings.php
13-
deploy/config/wikibase-php.ini
12+
deploy/config/*.ini
13+
deploy/config/*.json
14+
deploy/config/*.php
15+
deploy/config/extensions
1416

1517
test/log
1618
test/mwlog
19+
test/suites/config
1720
test/suites/**/results/
1821

1922
# dependencies

0 commit comments

Comments
 (0)