Skip to content

Commit

Permalink
Merge branch 'main' into sanmarg-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
sanmarg authored Jun 1, 2024
2 parents 06897c7 + 98f0eb4 commit 3e353f7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
14 changes: 1 addition & 13 deletions .github/workflows/delivery-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
target: [bionic, focal, jammy, lunar, noble]
target: [bionic, focal, jammy, noble]
runs-on: ubuntu-20.04
steps:
- name: Checkout code
Expand Down Expand Up @@ -103,18 +103,6 @@ jobs:
GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
PACKAGE_VERSION: ${{ steps.version.outputs.result }}

- name: Deliver lunar
if: matrix.target == 'lunar'
uses: docker://ubuntu:lunar
with:
entrypoint: .github/workflows/delivery/ubuntu/deliver.sh
env:
DEBIAN_FRONTEND: "noninteractive"
GO_DEP_PACKAGE_NAME: golang
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
PACKAGE_VERSION: ${{ steps.version.outputs.result }}

- name: Deliver noble
if: matrix.target == 'noble'
uses: docker://ubuntu:noble
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG base_image=gcr.io/distroless/static

FROM golang:1.20 as builder
FROM golang:1.22 as builder
ARG pack_version
ENV PACK_VERSION=$pack_version
WORKDIR /app
Expand Down

0 comments on commit 3e353f7

Please sign in to comment.