From 93e5afe7617631eadb530dc0f26b1db0d4c29602 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 17 Feb 2024 15:02:12 +0200 Subject: [PATCH] Update actions, pre-commit and dockerfile --- .github/workflows/go.yaml | 28 ++++++++++++++-------------- .pre-commit-config.yaml | 2 +- docker/Dockerfile | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index 1f573ec..fe95ab1 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -3,7 +3,7 @@ name: Go on: [push, pull_request] env: - GO_VERSION: "1.21" + GO_VERSION: "1.22" GHCR_REGISTRY: ghcr.io GHCR_REGISTRY_IMAGE: "ghcr.io/${{ github.repository }}" @@ -11,10 +11,10 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Go ${{ env.GO_VERSION }} - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} cache: true @@ -26,17 +26,17 @@ jobs: export PATH="$HOME/go/bin:$PATH" - name: Run pre-commit - uses: pre-commit/action@v3.0.0 + uses: pre-commit/action@v3.0.1 build: runs-on: ubuntu-latest env: CGO_ENABLED: "0" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Go ${{ env.GO_VERSION }} - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} cache: true @@ -45,28 +45,28 @@ jobs: run: ./ci-build-all.sh - name: Upload linux/amd64 artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bbctl-linux-amd64 path: bbctl-linux-amd64 if-no-files-found: error - name: Upload linux/arm64 artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bbctl-linux-arm64 path: bbctl-linux-arm64 if-no-files-found: error - name: Upload macos/amd64 artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bbctl-macos-amd64 path: bbctl-macos-amd64 if-no-files-found: error - name: Upload macos/arm64 artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bbctl-macos-arm64 path: bbctl-macos-arm64 @@ -76,17 +76,17 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.GHCR_REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Docker Build - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: cache-from: ${{ env.GHCR_REGISTRY_IMAGE }}:latest pull: true @@ -103,7 +103,7 @@ jobs: if: github.ref == 'refs/heads/main' steps: - name: Login to registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.GHCR_REGISTRY }} username: ${{ github.actor }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a79a5b8..8da0b8b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: trailing-whitespace exclude_types: [markdown] diff --git a/docker/Dockerfile b/docker/Dockerfile index 1e34f4d..59cd5fb 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,11 +1,11 @@ -FROM dock.mau.dev/tulir/lottieconverter:alpine-3.18 AS lottie +FROM dock.mau.dev/tulir/lottieconverter:alpine-3.19 AS lottie -FROM golang:1.21-alpine3.18 AS builder +FROM golang:1.22-alpine3.19 AS builder COPY . /build/ RUN cd /build && ./build.sh -FROM alpine:3.18 +FROM alpine:3.19 RUN apk add --no-cache bash curl jq git ffmpeg \ # Python for python bridges