[FORGEJO] use alpine 3.18

Refs: https://github.com/nektos/act/issues/1908

Bump Docker dependency

See https://code.forgejo.org/forgejo/act/pulls/9 for more info.

Use forked act change branch

Bump version

Use forgejo fork v1.9.0

Revert #50

Now that https://code.forgejo.org/forgejo/runner/pulls/64 has been
merged we should be good to go.

Remove pinned go version in test workflow

Bump Go version to 1.21
This commit is contained in:
Earl Warren 2023-05-30 11:47:06 +02:00
parent 182939943f
commit d4eb913533
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 4 additions and 4 deletions

View file

@ -4,6 +4,7 @@ on:
push: push:
paths: paths:
- go.mod - go.mod
- Dockerfile
- .forgejo/workflows/release.yml - .forgejo/workflows/release.yml
- .forgejo/workflows/integration.yml - .forgejo/workflows/integration.yml

View file

@ -36,8 +36,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v3 - uses: actions/setup-go@v3
with: with:
# pin because of https://github.com/nektos/act/issues/1908 go-version: '1.21'
go-version: 1.20.5
- uses: actions/checkout@v3 - uses: actions/checkout@v3

View file

@ -1,5 +1,5 @@
#Build stage #Build stage
FROM golang:1.20-alpine3.17 AS build-env FROM golang:1.21-alpine3.18 AS build-env
RUN apk --no-cache add build-base git RUN apk --no-cache add build-base git
@ -7,7 +7,7 @@ COPY . /srv
WORKDIR /srv WORKDIR /srv
RUN make build RUN make build
FROM alpine:3.17 FROM alpine:3.18
LABEL maintainer="contact@forgejo.org" LABEL maintainer="contact@forgejo.org"
COPY --from=build-env /srv/forgejo-runner /bin/forgejo-runner COPY --from=build-env /srv/forgejo-runner /bin/forgejo-runner