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

fix runners and bump go version #550

Merged
merged 11 commits into from
Feb 1, 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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
54 changes: 27 additions & 27 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
name: Lint
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
- name: Lint Agent Code
Expand All @@ -46,8 +46,8 @@ jobs:
name: Unit Tests
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
- name: Run Unit Tests
Expand All @@ -61,8 +61,8 @@ jobs:
name: Component Tests
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
- name: Run Component Tests
Expand All @@ -72,17 +72,17 @@ jobs:
name: Build unsigned snapshot
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
- name: Setup build environment
run: |
go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Build Docker Image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
file: scripts/packages/packager/Dockerfile
tags: build-local-packager:1.0.0
Expand All @@ -96,7 +96,7 @@ jobs:
run: |
make clean local-deb-package local-rpm-package local-txz-package local-apk-package
- name: Upload Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: nginx-agent-snapshots
path: build
Expand Down Expand Up @@ -140,14 +140,14 @@ jobs:
- image: "debian"
version: "bullseye-slim"
- image: "debian"
version: "buster-slim"
version: "bookworm-slim"
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.21.3'
go-version: '1.21.6'
- name: Download Packages
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: nginx-agent-snapshots
path: build
Expand All @@ -165,7 +165,7 @@ jobs:
- name: Archive integration test logs
if: success() || failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: integration-test-logs-${{ matrix.container.image }}-${{ matrix.container.version }}
path: /tmp/integration-test-logs/
Expand All @@ -176,11 +176,11 @@ jobs:
if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.ref_name, 'dependabot/') }}
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Docker Build
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Build Docker Image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
file: test/docker/Dockerfile
tags: nginx-agent-benchmark:1.0.0
Expand All @@ -199,10 +199,10 @@ jobs:
runs-on: ubuntu-22.04
if: ${{ !startsWith(github.ref_name, 'release-') && !startsWith(github.ref_name, 'dependabot/') && !github.event.pull_request.head.repo.fork }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
- name: Setup build environment
Expand All @@ -211,9 +211,9 @@ jobs:
sudo apt-get install -y gpgv1 monkeysphere
go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Build Docker Image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
file: scripts/packages/packager/Dockerfile
tags: build-signed-packager:1.0.0
Expand All @@ -231,7 +231,7 @@ jobs:
echo "$INDIGO_GPG_AGENT" | base64 --decode > .key.asc
make clean package
- name: Upload Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: nginx-agent-snapshots
path: ./build/azure/packages/nginx-agent.tar.gz
Expand Down Expand Up @@ -259,8 +259,8 @@ jobs:
name: Build Grafana Dashboard Example
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
- name: Setup build environment
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ jobs:
name: Update Release
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
- run: npm install semver
- name: Create Draft Release
uses: actions/github-script@v6
uses: actions/github-script@v7
id: release
with:
script: |
Expand Down Expand Up @@ -130,9 +130,9 @@ jobs:
git push origin "v${{env.VERSION}}"
git push origin "sdk/v${{env.VERSION}}"
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Build Docker Image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
file: scripts/packages/packager/Dockerfile
tags: build-signed-packager:1.0.0
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ DATE = $(shell date +%F_%H-%M-%S)
# | ---------------- | ----------------------------------------- | -------------------------------------------------------------- |
# | amazonlinux | 2, 2023 | |
# | ubuntu | 20.04, 22.04 | |
# | debian | bullseye-slim, buster-slim | |
# | debian | bullseye-slim, bookworm-slim | |
# | centos | 7 | |
# | redhatenterprise | 7, 8, 9 | |
# | rockylinux | 8, 9 | |
Expand Down
Loading
Loading