diff --git a/.github/workflows/gitleaks.yaml b/.github/workflows/gitleaks.yaml deleted file mode 100644 index 3e51c7e..0000000 --- a/.github/workflows/gitleaks.yaml +++ /dev/null @@ -1,38 +0,0 @@ -name: GitLeaks -on: [pull_request] - -permissions: - contents: read - -concurrency: - group: gitleaks-${{ github.ref }} - cancel-in-progress: true - -jobs: - gitleaks-scan: - runs-on: ubuntu-latest - container: - image: gcr.io/spectro-dev-public/bulwark/gitleaks:latest - env: - REPO: ${{ github.event.repository.name }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITLEAKS_CONFIG: config.toml - steps: - - name: run-bulwark-gitleaks-scan - shell: sh - env: - BRANCH: ${{ github.head_ref || github.ref_name }} - run: /workspace/bulwark -name CodeSASTGitLeaks -target $REPO -tags "branch:$BRANCH,options:--log-opts origin..HEAD" - - - name: check-result - shell: sh - run: | - resultPath=./$REPO/gitleaks.json - cat $resultPath | grep -v \"Match\"\: | grep -v \"Secret\"\: - total_failed_tests=`cat $resultPath | grep \"Fingerprint\"\: | wc -l` - if [ "$total_failed_tests" -gt 0 ]; then - echo "GitLeaks validation check failed with above findings..." - exit 1 - else - echo "GitLeaks validation check passed" - fi diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 08e6a8b..d0249dd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -7,6 +7,7 @@ on: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_VERSION: "24" permissions: contents: write # Required for semantic-release to create releases and tags @@ -27,7 +28,7 @@ jobs: - name: Setup Nodejs uses: actions/setup-node@v6 with: - node-version: "20" + node-version: ${{ env.NODE_VERSION }} - name: Install dependencies run: npm ci @@ -99,7 +100,7 @@ jobs: - name: Setup Nodejs uses: actions/setup-node@v6 with: - node-version: "20" + node-version: ${{ env.NODE_VERSION }} - name: Install dependencies run: npm ci @@ -183,7 +184,7 @@ jobs: - name: Setup Nodejs uses: actions/setup-node@v6 with: - node-version: "20" + node-version: ${{ env.NODE_VERSION }} - name: Install dependencies run: npm ci diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c86fe77..25e667c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -8,6 +8,7 @@ on: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_VERSION: "24" permissions: contents: read @@ -29,7 +30,7 @@ jobs: - name: Setup Nodejs uses: actions/setup-node@v6 with: - node-version: "20" + node-version: ${{ env.NODE_VERSION }} - name: Install dependencies run: npm ci @@ -66,7 +67,7 @@ jobs: - name: Setup Nodejs uses: actions/setup-node@v6 with: - node-version: "20" + node-version: ${{ env.NODE_VERSION }} - name: Install dependencies run: npm ci @@ -92,3 +93,23 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: ghcr.io/${{ github.repository }}:dev-proxy + + semantic: + name: "Semantic Release Dry Run" + runs-on: ubuntu-latest + if: ${{ !github.event.pull_request.draft }} + steps: + - id: checkout + name: Checkout Repository + uses: actions/checkout@v6 + + - name: Setup Nodejs + uses: actions/setup-node@v6 + with: + node-version: ${{ env.NODE_VERSION }} + + - name: Install dependencies + run: npm ci + + - name: Semantic Release Dry Run + run: npx semantic-release --dry-run \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 5e7a2f4..5613e60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20-alpine AS modules +FROM node:24-alpine AS modules WORKDIR /app COPY . . RUN adduser -u 1002 -h /home/appuser -D appuser appuser && \ diff --git a/Dockerfile.Caddy b/Dockerfile.Caddy index 074ef20..2dc6610 100644 --- a/Dockerfile.Caddy +++ b/Dockerfile.Caddy @@ -1,4 +1,4 @@ -FROM node:20-alpine AS modules +FROM node:24-alpine AS modules WORKDIR /app COPY . . RUN adduser -u 1002 -h /home/appuser -D appuser appuser && \ diff --git a/package-lock.json b/package-lock.json index aa2b584..5b1c434 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "react-chartjs-2": "^5.3.1", "react-dom": "19.2.0", "react-inject-env": "^2.1.0", - "react-router-dom": "^7.11.0", + "react-router-dom": "^7.12.0", "react-scripts": "^5.0.1", "react-spring": "^10", "serve": "^14.2.5", @@ -31066,9 +31066,9 @@ } }, "node_modules/react-router": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.11.0.tgz", - "integrity": "sha512-uI4JkMmjbWCZc01WVP2cH7ZfSzH91JAZUDd7/nIprDgWxBV1TkkmLToFh7EbMTcMak8URFRa2YoBL/W8GWnCTQ==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.12.0.tgz", + "integrity": "sha512-kTPDYPFzDVGIIGNLS5VJykK0HfHLY5MF3b+xj0/tTyNYL1gF1qs7u67Z9jEhQk2sQ98SUaHxlG31g1JtF7IfVw==", "license": "MIT", "dependencies": { "cookie": "^1.0.1", @@ -31088,12 +31088,12 @@ } }, "node_modules/react-router-dom": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.11.0.tgz", - "integrity": "sha512-e49Ir/kMGRzFOOrYQBdoitq3ULigw4lKbAyKusnvtDu2t4dBX4AGYPrzNvorXmVuOyeakai6FUPW5MmibvVG8g==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.12.0.tgz", + "integrity": "sha512-pfO9fiBcpEfX4Tx+iTYKDtPbrSLLCbwJ5EqP+SPYQu1VYCXdy79GSj0wttR0U4cikVdlImZuEZ/9ZNCgoaxwBA==", "license": "MIT", "dependencies": { - "react-router": "7.11.0" + "react-router": "7.12.0" }, "engines": { "node": ">=20.0.0" diff --git a/package.json b/package.json index 7ace801..70574a1 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "react-chartjs-2": "^5.3.1", "react-dom": "19.2.0", "react-inject-env": "^2.1.0", - "react-router-dom": "^7.11.0", + "react-router-dom": "^7.12.0", "react-scripts": "^5.0.1", "react-spring": "^10", "serve": "^14.2.5",