Skip to content
This repository was archived by the owner on Dec 16, 2022. It is now read-only.

Update Go to v1.17.3 #7

Closed
wants to merge 2 commits into from
Closed
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .dockerignore

This file was deleted.

4 changes: 3 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ jobs:
- 5000:5000
steps:
- name: Checkout
id: checkout
uses: actions/checkout@v2
- name: Unshallow
run: git fetch --prune --unshallow
- name: Set up QEMU
id: qemu
uses: docker/setup-qemu-action@v1
Expand Down Expand Up @@ -54,6 +55,7 @@ jobs:
key: ${{ runner.os }}-buildx-ghcache-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-ghcache-
- run: cat ./hack/Makefile
- name: Build candidate image
id: build_candidate
uses: docker/build-push-action@v2
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM scratch

COPY hack/Makefile Makefile
COPY ./hack/Makefile Makefile
4 changes: 2 additions & 2 deletions Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This Dockerfile tests the hack/Makefile output against git2go.
ARG BASE_VARIANT=bullseye
ARG GO_VERSION=1.16.8
ARG GO_VERSION=1.17.3
ARG XX_VERSION=1.0.0-rc.2

FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
Expand All @@ -12,7 +12,7 @@ FROM gostable AS go-linux
FROM go-${TARGETOS} AS build-base-bullseye

COPY --from=xx / /
COPY hack/Makefile /libgit2/Makefile
COPY ./hack/Makefile /libgit2/Makefile

RUN make -C /libgit2/ cmake

Expand Down