Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature 1337: Dependency Update #1389

Merged
merged 4 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Expand Up @@ -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.
Expand Down
27 changes: 20 additions & 7 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/secrets.txt

# JetBrains IDE files
/.idea/
.idea/

# Local Docker volumes
/volumes/
Expand Down
Loading
Loading