From fd5c5960c261fbe0d062ad41f11549d406f12063 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 3 Jun 2020 16:22:59 -0400 Subject: [PATCH] Fixes for release --- .github/workflows/ci.yaml | 2 +- ci/build/build-packages.sh | 2 +- ci/images/centos7/Dockerfile | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1cb589634..dcf917841 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -136,7 +136,7 @@ jobs: name: release-packages path: ./release-packages - name: Run ./ci/steps/build-docker-image.sh - uses: ./ci/images/debian8 + uses: ./ci/images/centos7 with: args: ./ci/steps/build-docker-image.sh - name: Upload release image diff --git a/ci/build/build-packages.sh b/ci/build/build-packages.sh index 8149289ce..5c770a4a8 100755 --- a/ci/build/build-packages.sh +++ b/ci/build/build-packages.sh @@ -30,7 +30,7 @@ release_archive() { local release_name="code-server-$VERSION-$OS-$ARCH" if [[ $OS == "linux" ]]; then tar -czf "release-packages/$release_name.tar.gz" --transform "s/^\.\/release-standalone/$release_name/" ./release-standalone - elif [[ $OS == "macos" && $ARCH == "x86_64" ]]; then + elif [[ "$OS" == "darwin" && "$ARCH" == "x86_64" ]]; then # Just exists to make autoupdating from 3.2.0 work again. mv ./release-standalone "./$release_name" zip -r "release-packages/$release_name.zip" "./$release_name" diff --git a/ci/images/centos7/Dockerfile b/ci/images/centos7/Dockerfile index 58df99a85..4e3f1f94c 100644 --- a/ci/images/centos7/Dockerfile +++ b/ci/images/centos7/Dockerfile @@ -22,3 +22,5 @@ ENV PATH=/usr/local/go/bin:/root/go/bin:$PATH ENV GO111MODULE=on RUN go get mvdan.cc/sh/v3/cmd/shfmt RUN go get github.com/goreleaser/nfpm/cmd/nfpm + +RUN curl -fsSL https://get.docker.com | sh