Skip to content

Commit

Permalink
Merge branch 'main' into concurrent-edit-config-family
Browse files Browse the repository at this point in the history
  • Loading branch information
mattmundell authored Oct 17, 2023
2 parents a864442 + 9275bbd commit 56cd103
Show file tree
Hide file tree
Showing 121 changed files with 20,013 additions and 18,819 deletions.
27 changes: 20 additions & 7 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,17 +1,30 @@
{
"presets": ["react-app"],
"presets": [
"react-app"
],
"plugins": [
[
"i18next-extract",
{
"locales": ["de"],
"pluralSeparator": null,
"locales": [
"de",
"zh_TW",
"zh_CN"
],
"contextSeparator": null,
"nsSeparator": null,
"keySeparator": null,
"nsSeparator": false,
"keySeparator": false,
"outputPath": "public/locales/gsa-{{locale}}.json",
"tFunctionNames": ["_", "_l"],
"discardOldKeys": true
"tFunctionNames": [
"_",
"_l"
],
"discardOldKeys": true,
"keyAsDefaultValue": [
"en"
],
"useI18nextDefaultValue": false,
"keyAsDefaultValueForDerivedKeys": false
}
]
]
Expand Down
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ updates:
schedule:
interval: monthly
time: '04:00'
groups:
patch-updates:
patterns:
- "*"
update-types:
- "patch"
open-pull-requests-limit: 10
versioning-strategy: increase
ignore:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- 18
- 20
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up node ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand All @@ -43,7 +43,7 @@ jobs:
node-version:
- 18
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up node ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
- 18
- 20
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up node ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: greenbone/actions/is-latest-tag@v3
id: latest
- name: Setup container meta information
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ github.repository }}
labels: |
Expand Down Expand Up @@ -55,16 +55,16 @@ jobs:
fi
- name: Login to Docker Registry
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Build and push Container image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: ${{ github.event_name != 'pull_request' && (github.ref_type == 'tag' || github.ref_name == 'main') }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/release-pontos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,18 @@ jobs:
runs-on: "ubuntu-latest"
needs: release
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ needs.release.outputs.git-release-tag }}
- name: Set up node
uses: actions/setup-node@v3
with:
node-version: "14"
cache: "npm"
- name: Install npm dependencies
run: npm install
- name: Build dist files
run: node run build
run: npm run build
- name: Create tarballs
run: |
tar -C build -czvf gsa-dist-${{ needs.release.outputs.release-version }}.tar.gz .
Expand Down
Loading

0 comments on commit 56cd103

Please sign in to comment.