Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/typescript-5.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
gusevda authored Jan 10, 2025
2 parents 0927273 + 0d60850 commit d9e3064
Show file tree
Hide file tree
Showing 4 changed files with 140 additions and 1,008 deletions.
62 changes: 0 additions & 62 deletions .github/workflows/build-image.yaml

This file was deleted.

43 changes: 43 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,49 @@ jobs:
- name: Check that make fakes has been run
run: git diff --no-ext-diff --exit-code

build-push-image:
name: CI Build Image
runs-on: ubuntu-latest
permissions:
packages: write # for docker/build-push-action to push images
strategy:
matrix:
docker-image:
- gitops
- gitops-server
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Set build-time flags
run: |
echo "LDFLAGS=$(make echo-ldflags)" >> $GITHUB_ENV
echo "FLUX_VERSION=$(make echo-flux-version)" >> $GITHUB_ENV
- uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
id: meta
with:
images: ghcr.io/${{ github.repository }}/${{ matrix.docker-image }}
tags: |
type=ref,event=branch
type=ref,event=pr
- uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
- uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
with:
context: .
file: ${{ matrix.docker-image }}.dockerfile
build-args: |
FLUX_VERSION=${{ env.FLUX_VERSION }}
LDFLAGS=${{ env.LDFLAGS }}
GIT_COMMIT=${{ github.sha }}
push: ${{ github.event_name != 'pull_request' && github.repository == 'weaveworks/weave-gitops' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max

ci-upload-binary:
name: Upload Binary - Disabled
runs-on: ${{matrix.os}}
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@
"@babel/core": "^7.26.0",
"@babel/preset-env": "^7.26.0",
"@eslint/js": "9.17.0",
"@parcel/config-default": "^2.8.3",
"@parcel/config-default": "^2.13.3",
"@parcel/core": "^2.13.3",
"@parcel/optimizer-data-url": "^2.8.3",
"@parcel/transformer-inline-string": "^2.8.3",
"@parcel/optimizer-data-url": "^2.13.3",
"@parcel/transformer-inline-string": "^2.13.3",
"@parcel/transformer-typescript-tsc": "^2.13.3",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.6.3",
Expand Down Expand Up @@ -117,6 +117,7 @@
"prettier": "^3.4.2",
"process": "^0.11.10",
"react-test-renderer": "^18.0.0",
"svgo": "^3",
"ts-jest": "^29.2.5",
"typescript": "^5.7.3",
"typescript-eslint": "^8.19.1",
Expand Down
Loading

0 comments on commit d9e3064

Please sign in to comment.