Skip to content
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
24 changes: 12 additions & 12 deletions .github/workflows/ci-post-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
release_commit: ${{ startsWith(github.event.head_commit.message, 'Release v') }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Setup Go
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version: 1.24
go-version: '1.25'
- name: Re-test
run: make test

Expand All @@ -30,11 +30,11 @@ jobs:
needs: re-test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v6
with:
role-to-assume: arn:aws:iam::803339316953:role/github-actions-ecr-push-llmariners
aws-region: us-east-1
Expand All @@ -44,7 +44,7 @@ jobs:
with:
registry-type: public
- name: Build and publish docker image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v7
with:
file: ./build/server/Dockerfile
push: true
Expand All @@ -57,15 +57,15 @@ jobs:
needs: re-test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Extract version
run: |
ver=$(echo "$COMMIT_MESSAGE"| head -n1 | awk '{print $2}' |sed 's/v//')
echo "version=${ver}" >> $GITHUB_ENV
env:
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v6
with:
role-to-assume: arn:aws:iam::803339316953:role/github-actions-ecr-push-llmariners
aws-region: us-east-1
Expand All @@ -75,9 +75,9 @@ jobs:
with:
registry-type: public
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
- name: Build and publish docker image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v7
with:
file: ./build/server/Dockerfile
push: true
Expand All @@ -92,7 +92,7 @@ jobs:
helm package --version ${{ env.version }} ./deployments/server
helm push cluster-manager-server-${{ env.version }}.tgz oci://public.ecr.aws/cloudnatix/llmariner-charts
- name: Create release
uses: softprops/action-gh-release@v2.0.8
uses: softprops/action-gh-release@v2
with:
tag_name: v${{ env.version }}
target_commitish: ${{ github.sha }}
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/ci-pre-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Setup Go
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version: 1.24
go-version: '1.25'
- name: Install errcheck
run: go install github.com/kisielk/errcheck@latest
- name: Install golint
Expand All @@ -31,14 +31,13 @@ jobs:
name: golangci-lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
go-version: '1.24'
go-version: '1.25'
cache: false
- name: golangci-lint
uses: golangci/golangci-lint-action@v8
with:
version: v2.2.1
args: --timeout=10m
only-new-issues: true
2 changes: 1 addition & 1 deletion build/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.24 AS builder
FROM --platform=$BUILDPLATFORM golang:1.25 AS builder
ARG TARGETARCH

WORKDIR /workspace
Expand Down
Loading