diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1b11ce4..6777db7 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,24 +13,24 @@ jobs: steps: - name: Set latest stable go version - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: 'stable' - name: Check out code into the Go module directory - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: '0' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: queries: +security-and-quality languages: go - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/docker-tag.yml b/.github/workflows/docker-tag.yml index e51d485..e28a84e 100644 --- a/.github/workflows/docker-tag.yml +++ b/.github/workflows/docker-tag.yml @@ -11,14 +11,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Check Out Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get short SHA from commit hash id: tagcalc - run: echo "::set-output name=tagname::$(git describe --tags --abbrev=0 HEAD)" + run: echo "tagname=$(git describe --tags --abbrev=0 HEAD)" >> $GITHUB_OUTPUT - name: Login to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index def0cca..263a360 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,13 +9,13 @@ jobs: steps: - name: Get short SHA from commit hash id: shacalc - run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" + run: echo "sha8=${GITHUB_SHA:0:8}" >> $GITHUB_OUTPUT - name: Check Out Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Login to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index fe59bd7..359b58f 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Check out code into the Go module directory - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: '0' @@ -28,26 +28,31 @@ jobs: - name: Build run: | GOOS=linux make build-stayrtr + GOOS=linux GOARCH=arm64 make build-stayrtr GOOS=darwin make build-stayrtr GOOS=windows EXTENSION=.exe make build-stayrtr GOOS=linux make build-rtrdump + GOOS=linux GOARCH=arm64 make build-rtrdump GOOS=darwin make build-rtrdump GOOS=windows EXTENSION=.exe make build-rtrdump GOOS=linux make build-rtrmon + GOOS=linux GOARCH=arm64 make build-rtrmon GOOS=darwin make build-rtrmon GOOS=windows EXTENSION=.exe make build-rtrmon - + - name: Install fpm run: | sudo apt-get update sudo apt-get install -y rpm ruby ruby-dev sudo gem install fpm - + - name: Package - run: make package-deb-stayrtr package-rpm-stayrtr + run: | + make package-deb-stayrtr package-rpm-stayrtr + GOARCH=arm64 make package-deb-stayrtr package-rpm-stayrtr - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: dist path: dist/* diff --git a/Makefile b/Makefile index d840978..ad40081 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ EXTENSION ?= DIST_DIR ?= dist/ GOOS ?= linux -ARCH ?= $(shell uname -m) +GOARCH ?= x86_64 +ARCH ?= $(GOARCH) BUILDINFOSDET ?= DOCKER_REPO := rpki/ STAYRTR_NAME := stayrtr STAYRTR_VERSION := $(shell git describe --tags $(git rev-list --tags --max-count=1)) VERSION_PKG := $(shell echo $(STAYRTR_VERSION) | sed 's/^v//g') -ARCH := x86_64 LICENSE := BSD-3 URL := https://github.com/bgp/stayrtr DESCRIPTION := StayRTR: a RPKI-to-Router server