Skip to content

Commit

Permalink
Merge pull request #1389 from swisstopo/feature/viewer-1337-dependenc…
Browse files Browse the repository at this point in the history
…y-update

Feature 1337: Dependency Update
  • Loading branch information
daniel-va authored Nov 27, 2024

Unverified

The committer email address is not verified.
2 parents 6b78834 + c38e749 commit 48d6733
Showing 65 changed files with 6,867 additions and 6,804 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
package-lock.json -diff
* -text
1 change: 1 addition & 0 deletions .github/scripts/find-version.js
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ const findNextVersion = (tags, branch) => {
if (version.preRelease == null || version.patch !== 0) {
version.minor += 1;
version.patch = 0;
version.preRelease = null
}
} else {
// It's a patch.
27 changes: 20 additions & 7 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
@@ -8,10 +8,10 @@ on:
- "!main"

env:
NODE_VERSION: "22.x"
RUST_VERSION: "1.73"
NODE_VERSION: "22.5.1"
RUST_VERSION: "1.82"
SQLX_OFFLINE: true
SQLX_VERSION: 0.7.3
SQLX_VERSION: "0.8.2"
PGHOST: localhost # Overrides the default value in .env

jobs:
@@ -33,6 +33,16 @@ jobs:
uses: actions/checkout@v4
- name: Review Dependencies
uses: actions/dependency-review-action@v4
with:
# Disable scorecard output for now, as the output may get too large otherwise,
# causing the action to fail.
show-openssf-scorecard: false

# Allow GHSA-qg5g-gv98-5ffh (https://github.com/advisories/GHSA-qg5g-gv98-5ffh)
# Very recently found as of now (2024-11-26).
# Affects the Rust crate `rustls`, which is in use by multiple of our dependencies.
# There are no fixes for it yet.
allow-ghsas: GHSA-qg5g-gv98-5ffh


install-ui:
@@ -65,7 +75,7 @@ jobs:
restore-keys: |
${{ runner.os }}-node_modules-
- name: Install node dependencies
run: cd ui && npm install
run: cd ui && npm ci


check-ui:
@@ -107,7 +117,9 @@ jobs:
path: ./ui/node_modules
key: "${{ runner.os }}-node_modules-${{ env.NODE_VERSION }}-${{ hashFiles('./ui/package-lock.json') }}"
- name: Run tests
run: cd ui && npm run test
run: |
cd ui
npm run test
lint-ui:
@@ -128,7 +140,9 @@ jobs:
path: ./ui/node_modules
key: "${{ runner.os }}-node_modules-${{ env.NODE_VERSION }}-${{ hashFiles('./ui/package-lock.json') }}"
- name: Run lint
run: cd ui && npm run lint
run: |
cd ui
npm run lint
install-api:
@@ -174,7 +188,6 @@ jobs:
- name: Setup SQLx
run: |
cd api
SQLX_VERSION=0.7.3
if [[ ! -f ~/.cargo/bin/sqlx ]] || [[ $(sqlx --version) != "sqlx-cli $SQLX_VERSION" ]]; then
cargo install sqlx-cli --version $SQLX_VERSION --no-default-features --features native-tls,postgres --locked --quiet
fi
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
/secrets.txt

# JetBrains IDE files
/.idea/
.idea/

# Local Docker volumes
/volumes/
Loading

0 comments on commit 48d6733

Please sign in to comment.