Skip to content

Commit 410fb42

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/wdio-chromedriver-service-8.1.1
2 parents 825482c + 4ad7bd8 commit 410fb42

36 files changed

Lines changed: 17460 additions & 4578 deletions

.env.development.local

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ VUE_APP_API_MOCK=0
44
VUE_APP_RECAPTCHA_SITE_KEY="6LeHzbMUAAAAABjNp0vILaWr5ZeYHmteF7rGuZNV" # todo replace with test key
55
VUE_APP_BUILD_FOR_DOCKER_IMAGE=0
66
VUE_APP_CNAME_RECORD=sites-1.dyna.wbaas.localhost
7+
VUE_APP_SUBDOMAIN_SUFFIX=".wbaas.localhost"

.env.development.mock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ VUE_APP_API_MOCK=1
44
VUE_APP_RECAPTCHA_SITE_KEY="6LeHzbMUAAAAABjNp0vILaWr5ZeYHmteF7rGuZNV"
55
VUE_APP_BUILD_FOR_DOCKER_IMAGE=0
66
VUE_APP_CNAME_RECORD=sites-1.dyna.wbaas.localhost
7+
VUE_APP_SUBDOMAIN_SUFFIX=".wbaas.localhost"

.env.development.prod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ VUE_APP_API_MOCK=0
44
VUE_APP_RECAPTCHA_SITE_KEY="6LeHzbMUAAAAABjNp0vILaWr5ZeYHmteF7rGuZNV"
55
VUE_APP_BUILD_FOR_DOCKER_IMAGE=0
66
VUE_APP_CNAME_RECORD=sites-1.dyna.wbstack.com
7+
VUE_APP_SUBDOMAIN_SUFFIX=".wikibase.cloud"

.env.development.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ VUE_APP_API_MOCK=0
44
VUE_APP_RECAPTCHA_SITE_KEY="6LeHzbMUAAAAABjNp0vILaWr5ZeYHmteF7rGuZNV" # todo replace with test key
55
VUE_APP_BUILD_FOR_DOCKER_IMAGE=0
66
VUE_APP_CNAME_RECORD=sites-1.dyna.wbaas.localhost
7+
VUE_APP_SUBDOMAIN_SUFFIX=".wbaas.localhost"

.eslintrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ module.exports = {
1414
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
1515
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
1616
'vue/multi-word-component-names': 'warn',
17-
'vue/no-reserved-component-names': 'warn'
17+
'vue/no-reserved-component-names': 'warn',
18+
'vue/no-mutating-props': 'warn'
1819
},
1920
overrides: [
2021
{

.github/workflows/docker.build.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,24 @@ jobs:
1414
uses: actions/checkout@v3.5.3
1515
- name: Docker meta
1616
id: docker_meta
17-
uses: crazy-max/ghaction-docker-meta@v4.6.0
17+
uses: crazy-max/ghaction-docker-meta@v5.7.0
1818
with:
1919
images: ghcr.io/${{ github.repository }}
2020
tags: |
2121
type=sha
2222
- name: Set up QEMU
2323
uses: docker/setup-qemu-action@v2.2.0
2424
- name: Set up Docker Buildx
25-
uses: docker/setup-buildx-action@v2.9.1
25+
uses: docker/setup-buildx-action@v3.11.1
2626
- name: Set up helmfile
27-
uses: helmfile/helmfile-action@v1.9.1
27+
uses: helmfile/helmfile-action@v2.0.5
28+
with:
29+
helmfile-version: 'v0.162.0'
30+
helm-version: 'v3.12.2'
31+
helm-plugins: >
32+
https://github.com/databus23/helm-diff@v3.12.5
2833
- name: Cache Docker layers
29-
uses: actions/cache@v3.3.1
34+
uses: actions/cache@v4
3035
with:
3136
path: /tmp/.buildx-cache
3237
key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -90,7 +95,7 @@ jobs:
9095
MSG=$(git log -1 --pretty=format:%s)
9196
echo "msg=$MSG" >> $GITHUB_OUTPUT
9297
- name: Create Staging+Local Pull Request
93-
uses: peter-evans/create-pull-request@v5
98+
uses: peter-evans/create-pull-request@v7
9499
if: github.event_name != 'pull_request'
95100
with:
96101
path: ./repos/wbaas-deploy-staging
@@ -106,7 +111,7 @@ jobs:
106111
107112
**Changes**: [${{ steps.truncate-commit-message.outputs.msg }}](https://github.com/wbstack/ui/commit/${{ github.sha }})
108113
- name: Create Production Pull Request
109-
uses: peter-evans/create-pull-request@v5
114+
uses: peter-evans/create-pull-request@v7
110115
if: github.event_name != 'pull_request'
111116
with:
112117
path: ./repos/wbaas-deploy-production

0 commit comments

Comments
 (0)