Skip to content

Commit b2e94c5

Browse files
gusevdagusevda
committed
Merge branch 'main' into dependabot/npm_and_yarn/d3-dag-1.1.0
2 parents b6ffd02 + ab5ecf2 commit b2e94c5

File tree

10 files changed

+818
-647
lines changed

10 files changed

+818
-647
lines changed

‎.github/dependabot.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ updates:
1414
eslint:
1515
patterns:
1616
- eslint
17+
- "@eslint/*"
1718
- "@typescript-eslint/*"
1819
mui:
1920
patterns:
@@ -31,9 +32,13 @@ updates:
3132
exclude-patterns:
3233
- react-lottie-player
3334
- react-markdown
34-
- react-router-dom
3535
- react-syntax-highlighter
3636
- react-toastify
37+
ignore:
38+
# ignore all updates to react-router-dom as
39+
# it goes away with react router 7.
40+
# will be removed entirely when update completed
41+
- dependency-name: react-router-dom
3742
# Maintain dependencies for backend
3843
- package-ecosystem: "gomod"
3944
directory: "/"

‎.github/workflows/build-push-image.yaml

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
name: Build and Push image
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
file:
7+
required: true
8+
type: string
9+
flavor:
10+
type: string
11+
image:
12+
required: true
13+
type: string
14+
platforms:
15+
type: string
16+
push:
17+
required: true
18+
type: boolean
19+
ref:
20+
type: string
21+
tags:
22+
required: true
23+
type: string
24+
25+
permissions:
26+
contents: read # for actions/checkout to fetch code
27+
28+
jobs:
29+
build-push-image:
30+
runs-on: ubuntu-latest
31+
permissions:
32+
packages: write # for docker/build-push-action to push images
33+
id-token: write # for Cosign to be able to sign images with GHA token
34+
steps:
35+
- name: Checkout
36+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
37+
with:
38+
ref: ${{ inputs.ref }}
39+
- name: Unshallow
40+
if: ${{ inputs.ref != '' }}
41+
run: |
42+
git fetch --prune --unshallow
43+
git fetch --tags -f
44+
- name: Set build-time flags
45+
run: |
46+
echo "LDFLAGS=$(make echo-ldflags)" >> $GITHUB_ENV
47+
echo "FLUX_VERSION=$(make echo-flux-version)" >> $GITHUB_ENV
48+
- uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
49+
id: meta
50+
with:
51+
images: ${{ inputs.image }}
52+
tags: ${{ inputs.tags }}
53+
flavor: ${{ inputs.flavor }}
54+
- name: setup qemu
55+
if: ${{ inputs.platforms != '' }}
56+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
57+
- uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
58+
- uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
59+
with:
60+
registry: ghcr.io
61+
username: ${{ github.actor }}
62+
password: ${{ secrets.GITHUB_TOKEN }}
63+
- uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
64+
id: build
65+
with:
66+
context: .
67+
platforms: ${{ inputs.platforms }}
68+
file: ${{ inputs.file }}
69+
build-args: |
70+
FLUX_VERSION=${{ env.FLUX_VERSION }}
71+
LDFLAGS=${{ env.LDFLAGS }}
72+
GIT_COMMIT=${{ github.sha }}
73+
push: ${{ inputs.push }}
74+
tags: ${{ steps.meta.outputs.tags }}
75+
labels: ${{ steps.meta.outputs.labels }}
76+
cache-from: type=gha
77+
cache-to: type=gha,mode=max
78+
- name: Install cosign
79+
if: ${{ inputs.push }}
80+
uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
81+
- name: Keyless signing of image
82+
if: ${{ inputs.push }}
83+
run: |
84+
echo ${{ steps.build.outputs.imageid }}
85+
echo ${{ steps.build.outputs.digest }}
86+
cosign sign --yes ${{ inputs.image }}@${{ steps.build.outputs.digest }}
87+
- name: Verify the image signing
88+
if: ${{ inputs.push }}
89+
run: |
90+
cosign verify ${{ inputs.image }}@${{ steps.build.outputs.digest }} \
91+
--certificate-identity "https://github.com/${{ github.workflow_ref }}" \
92+
--certificate-oidc-issuer "https://token.actions.githubusercontent.com" | jq .

‎.github/workflows/ossf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ jobs:
4444

4545
# required for Code scanning alerts
4646
- name: "Upload SARIF results to code scanning"
47-
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
47+
uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
4848
with:
4949
sarif_file: results.sarif

‎.github/workflows/pr.yaml

Lines changed: 10 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -71,65 +71,23 @@ jobs:
7171

7272
build-push-image:
7373
name: CI Build Image
74-
runs-on: ubuntu-latest
75-
env:
76-
IMAGE_NAME: ghcr.io/${{ github.repository }}/${{ matrix.docker-image }}
74+
uses: ./.github/workflows/build-push-image.yaml
75+
with:
76+
file: ${{ matrix.docker-image }}.dockerfile
77+
image: ghcr.io/${{ github.repository }}/${{ matrix.docker-image }}
78+
push: ${{ github.event_name != 'pull_request' && github.repository == 'weaveworks/weave-gitops' }}
79+
tags: |
80+
type=ref,event=branch
81+
type=ref,event=pr
7782
permissions:
78-
packages: write # for docker/build-push-action to push images
83+
contents: read # for actions/checkout to fetch code
7984
id-token: write # for Cosign to be able to sign images with GHA token
85+
packages: write # for docker/build-push-action to push images
8086
strategy:
8187
matrix:
8288
docker-image:
8389
- gitops
8490
- gitops-server
85-
steps:
86-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
87-
- name: Set build-time flags
88-
run: |
89-
echo "LDFLAGS=$(make echo-ldflags)" >> $GITHUB_ENV
90-
echo "FLUX_VERSION=$(make echo-flux-version)" >> $GITHUB_ENV
91-
- uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
92-
id: meta
93-
with:
94-
images: ${{ env.IMAGE_NAME }}
95-
tags: |
96-
type=ref,event=branch
97-
type=ref,event=pr
98-
- uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
99-
- uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
100-
with:
101-
registry: ghcr.io
102-
username: ${{ github.actor }}
103-
password: ${{ secrets.GITHUB_TOKEN }}
104-
- uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
105-
id: build
106-
with:
107-
context: .
108-
file: ${{ matrix.docker-image }}.dockerfile
109-
build-args: |
110-
FLUX_VERSION=${{ env.FLUX_VERSION }}
111-
LDFLAGS=${{ env.LDFLAGS }}
112-
GIT_COMMIT=${{ github.sha }}
113-
push: ${{ github.event_name != 'pull_request' && github.repository == 'weaveworks/weave-gitops' }}
114-
tags: ${{ steps.meta.outputs.tags }}
115-
labels: ${{ steps.meta.outputs.labels }}
116-
cache-from: type=gha
117-
cache-to: type=gha,mode=max
118-
- name: Install cosign
119-
if: ${{ github.event_name != 'pull_request' && github.repository == 'weaveworks/weave-gitops' }}
120-
uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
121-
- name: Keyless signing of image
122-
if: ${{ github.event_name != 'pull_request' && github.repository == 'weaveworks/weave-gitops' }}
123-
run: |
124-
echo ${{ steps.build.outputs.imageid }}
125-
echo ${{ steps.build.outputs.digest }}
126-
cosign sign --yes ${{ env.IMAGE_NAME }}@${{ steps.build.outputs.digest }}
127-
- name: Verify the image signing
128-
if: ${{ github.event_name != 'pull_request' && github.repository == 'weaveworks/weave-gitops' }}
129-
run: |
130-
cosign verify ${{ env.IMAGE_NAME }}@${{ steps.build.outputs.digest }} \
131-
--certificate-identity "https://github.com/${{ github.workflow_ref }}" \
132-
--certificate-oidc-issuer "https://token.actions.githubusercontent.com" | jq .
13391

13492
ci-upload-binary:
13593
name: Upload Binary - Disabled

‎.github/workflows/release.yaml

Lines changed: 15 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ on:
88
permissions:
99
contents: read # for actions/checkout to fetch code
1010

11-
env:
12-
REGISTRY: ghcr.io
13-
IMAGE_NAME: weaveworks/wego-app
14-
1511
jobs:
1612
tag-release:
1713
if: github.event.review.state == 'approved' && startsWith(github.event.pull_request.head.ref, 'releases/')
@@ -62,55 +58,22 @@ jobs:
6258

6359
build-and-push-image:
6460
needs: tag-release
65-
runs-on: ubuntu-latest
61+
uses: ./.github/workflows/build-push-image.yaml
62+
with:
63+
file: gitops-server.dockerfile
64+
flavor: |
65+
latest=true
66+
image: ghcr.io/weaveworks/wego-app
67+
platforms: linux/amd64,linux/arm64
68+
push: true
69+
ref: ${{ github.event.pull_request.head.sha }}
70+
tags: |
71+
type=raw,value=${{ needs.tag-release.outputs.version }}
72+
type=semver,pattern={{version}},value=${{ needs.tag-release.outputs.version }}
6673
permissions:
67-
packages: write
68-
steps:
69-
- name: Checkout
70-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
71-
with:
72-
ref: ${{ github.event.pull_request.head.sha }}
73-
- name: Unshallow
74-
run: |
75-
git fetch --prune --unshallow
76-
git fetch --tags -f
77-
- name: Log in to the Container registry
78-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
79-
with:
80-
registry: ${{ env.REGISTRY }}
81-
username: ${{ github.actor }}
82-
password: ${{ secrets.GITHUB_TOKEN }}
83-
- name: Set build-time flags
84-
run: |
85-
echo "LDFLAGS=$(make echo-ldflags)" >> $GITHUB_ENV
86-
echo "FLUX_VERSION=$(make echo-flux-version)" >> $GITHUB_ENV
87-
- name: Extract metadata (tags, labels) for Docker
88-
id: meta
89-
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
90-
with:
91-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
92-
tags: |
93-
type=raw,value=${{ needs.tag-release.outputs.version }}
94-
type=semver,pattern={{version}},value=${{ needs.tag-release.outputs.version }}
95-
flavor: |
96-
latest=true
97-
- name: setup qemu
98-
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
99-
- name: setup docker buildx
100-
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
101-
- name: Build and push Docker image
102-
uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
103-
with:
104-
context: .
105-
platforms: linux/amd64,linux/arm64
106-
push: true
107-
tags: ${{ steps.meta.outputs.tags }}
108-
labels: ${{ steps.meta.outputs.labels }}
109-
file: gitops-server.dockerfile
110-
build-args: |
111-
FLUX_VERSION=${{ env.FLUX_VERSION }}
112-
LDFLAGS=${{ env.LDFLAGS }}
113-
GIT_COMMIT=${{ github.sha }}
74+
contents: read # for actions/checkout to fetch code
75+
id-token: write # for Cosign to be able to sign images with GHA token
76+
packages: write # for docker/build-push-action to push images
11477

11578
goreleaser:
11679
runs-on: ubuntu-latest

‎.github/workflows/scan.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
format: sarif
5151
output: trivy-results.sarif
5252
- name: Upload Trivy scan results to GitHub Security tab
53-
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
53+
uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
5454
with:
5555
sarif_file: trivy-results.sarif
5656

@@ -63,10 +63,10 @@ jobs:
6363
- name: Checkout repository
6464
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6565
- name: Initialize CodeQL
66-
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
66+
uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
6767
with:
6868
languages: go
6969
- name: Autobuild
70-
uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
70+
uses: github/codeql-action/autobuild@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
7171
- name: Perform CodeQL Analysis
72-
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
72+
uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1

‎package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,19 @@
7373
"react-dom": "^18.0.0",
7474
"react-is": "^18.0.0",
7575
"react-lottie-player": "^2.1.0",
76-
"react-markdown": "^8.0.7",
76+
"react-markdown": "^9.0.3",
7777
"react-query": "^3.39.3",
7878
"react-router-dom": "^5.2.0",
7979
"react-syntax-highlighter": "^15.6.1",
8080
"react-toastify": "^11.0.2",
81-
"remark-gfm": "^3.0.1",
81+
"remark-gfm": "^4.0.0",
8282
"styled-components": "^6.1.14",
8383
"yaml": "^2.7.0"
8484
},
8585
"devDependencies": {
8686
"@babel/core": "^7.26.0",
8787
"@babel/preset-env": "^7.26.0",
88-
"@eslint/js": "9.17.0",
88+
"@eslint/js": "9.18.0",
8989
"@parcel/config-default": "^2.13.3",
9090
"@parcel/core": "^2.13.3",
9191
"@parcel/optimizer-data-url": "^2.13.3",
@@ -105,7 +105,7 @@
105105
"babel-jest": "^29.7.0",
106106
"babel-plugin-styled-components": "^2.1.4",
107107
"buffer": "^6.0.3",
108-
"eslint": "9.17.0",
108+
"eslint": "9.18.0",
109109
"eslint-plugin-import": "^2.31.0",
110110
"jest": "^29.7.0",
111111
"jest-environment-jsdom": "^29.7.0",
@@ -123,15 +123,15 @@
123123
"typescript-eslint": "^8.19.1",
124124
"yarn-audit-fix": "^10.1.1"
125125
},
126-
"alias": {
127-
"yaml": "yaml/browser/dist/index.js"
128-
},
129126
"resolutions": {
130127
"cross-spawn": "^7.0.6",
131128
"commander": "^13.0.0"
132129
},
133130
"engines": {
134131
"node": ">=22.0"
135132
},
136-
"packageManager": "yarn@4.5.3"
133+
"packageManager": "yarn@4.5.3",
134+
"@parcel/resolver-default": {
135+
"packageExports": true
136+
}
137137
}

‎website/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@fortawesome/free-solid-svg-icons": "^6.7.2",
2626
"@fortawesome/react-fontawesome": "^0.2.2",
2727
"@mdx-js/react": "^3.1.0",
28-
"@types/react": "^19.0.4",
28+
"@types/react": "^19.0.5",
2929
"file-loader": "^6.2.0",
3030
"raw-loader": "^4.0.2",
3131
"react": "^19.0.0",

‎website/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4074,12 +4074,12 @@ __metadata:
40744074
languageName: node
40754075
linkType: hard
40764076

4077-
"@types/react@npm:^19.0.4":
4078-
version: 19.0.4
4079-
resolution: "@types/react@npm:19.0.4"
4077+
"@types/react@npm:^19.0.5":
4078+
version: 19.0.5
4079+
resolution: "@types/react@npm:19.0.5"
40804080
dependencies:
40814081
csstype: "npm:^3.0.2"
4082-
checksum: 10c0/96ecd1a73af57fd7b7facf5b36ec069b131c7608a98a0f1098183023bfb21c60a26a0dc09004fbe0ac70c436ef887bbec5690882cfb77c6e0c679f7e45987722
4082+
checksum: 10c0/6f3a25c826e8b274cf26b25ef7bd4a97aaa4d7b30a0ea529bf252c6f0387d74f44940dea55cfcac75829bee53cd4c82fdb41653b978954a08036d2812a0ae6d6
40834083
languageName: node
40844084
linkType: hard
40854085

@@ -13438,7 +13438,7 @@ __metadata:
1343813438
"@fortawesome/free-solid-svg-icons": "npm:^6.7.2"
1343913439
"@fortawesome/react-fontawesome": "npm:^0.2.2"
1344013440
"@mdx-js/react": "npm:^3.1.0"
13441-
"@types/react": "npm:^19.0.4"
13441+
"@types/react": "npm:^19.0.5"
1344213442
file-loader: "npm:^6.2.0"
1344313443
raw-loader: "npm:^4.0.2"
1344413444
react: "npm:^19.0.0"

0 commit comments

Comments
 (0)