From be214845e87c24c30435067da44f8a1e897e0e23 Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Sat, 7 Nov 2020 23:19:18 -0600 Subject: [PATCH 01/10] new release action --- .github/workflows/release.yaml | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/release.yaml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 00000000..e25ebb86 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,35 @@ +on: + workflow_dispatch: + inputs: + preRelease: + description: "Release channel" + required: true + default: "false" + draft: + description: "Release channel" + required: true + default: "false" +name: Create Release +jobs: + build: + name: Create Release + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + # - run: | + # - git log --no-merges --pretty=format:\"- %h %s\" + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + body: | + Changes in this Release + - First Change + - Second Change + draft: ${{ github.event.inputs.draft == "true" }} + prerelease: ${{ github.event.inputs.preRelease == "true" }} \ No newline at end of file From b3e2da724d4ba8df5616a2eebf90b3499049092b Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Sat, 7 Nov 2020 23:22:23 -0600 Subject: [PATCH 02/10] fixup! new release action --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e25ebb86..35e8171c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,7 +9,7 @@ on: description: "Release channel" required: true default: "false" -name: Create Release +name: Create Github Release jobs: build: name: Create Release From 618bd92966c739a19f9115e7514c49241864a982 Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Sat, 7 Nov 2020 23:24:27 -0600 Subject: [PATCH 03/10] fixup! new release action --- .github/workflows/release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 35e8171c..8d35004b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -2,11 +2,11 @@ on: workflow_dispatch: inputs: preRelease: - description: "Release channel" + description: "Pre Release" required: true default: "false" draft: - description: "Release channel" + description: "Draft Release" required: true default: "false" name: Create Github Release @@ -31,5 +31,5 @@ jobs: Changes in this Release - First Change - Second Change - draft: ${{ github.event.inputs.draft == "true" }} - prerelease: ${{ github.event.inputs.preRelease == "true" }} \ No newline at end of file + draft: ${{ github.event.inputs.draft == 'true' }} + prerelease: ${{ github.event.inputs.preRelease == 'true' }} \ No newline at end of file From a8f3d7eb463b92faf26ab88d37d40868dc0267a5 Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Sat, 7 Nov 2020 23:43:40 -0600 Subject: [PATCH 04/10] fixup! new release action --- .github/workflows/release.yaml | 50 +++++++++++++++++++++++++++++++--- ci/steps/build.sh | 12 ++++---- 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8d35004b..9440b947 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -13,12 +13,24 @@ name: Create Github Release jobs: build: name: Create Release - runs-on: ubuntu-latest + runs-on: macos-latest steps: - name: Checkout code uses: actions/checkout@v2 - # - run: | - # - git log --no-merges --pretty=format:\"- %h %s\" + # - name: Install Gon + # run: | + # brew tap mitchellh/gon + # brew install mitchellh/gon/gon + # - name: Import Signing Certificates + # uses: Apple-Actions/import-codesign-certs@v1 + # with: + # p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }} + # p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }} + - name: Build Release Assets + run: ./ci/steps/build.sh + env: + AC_USERNAME: ${{ secrets.AC_USERNAME }} + AC_PASSWORD: ${{ secrets.AC_PASSWORD }} - name: Create Release id: create_release uses: actions/create-release@v1 @@ -32,4 +44,34 @@ jobs: - First Change - Second Change draft: ${{ github.event.inputs.draft == 'true' }} - prerelease: ${{ github.event.inputs.preRelease == 'true' }} \ No newline at end of file + prerelease: ${{ github.event.inputs.preRelease == 'true' }} + - name: Upload Windows Release + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./ci/bin/coder-cli-linux-amd64.tar.gz + asset_name: coder-cli-linux-amd64.tar.gz + asset_content_type: application/zip + - name: Upload MacOS Release + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./ci/bin/coder-cli-darwin-amd64.zip + asset_name: coder-cli-darwin-amd64.zip + asset_content_type: application/zip + - name: Upload Linux Release + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./ci/bin/coder-cli-windows-386.zip + asset_name: coder-cli-windows-386.zip + asset_content_type: application/zip \ No newline at end of file diff --git a/ci/steps/build.sh b/ci/steps/build.sh index 0017f2b5..3ed5006d 100755 --- a/ci/steps/build.sh +++ b/ci/steps/build.sh @@ -30,15 +30,15 @@ build() { tar -czf "$artifact" coder ;; "darwin") - if [[ ${CI-} ]]; then - artifact="coder-cli-$GOOS-$GOARCH.zip" - gon -log-level debug ./gon.json - mv coder.zip $artifact - else + # if [[ ${CI-} ]]; then + # artifact="coder-cli-$GOOS-$GOARCH.zip" + # gon -log-level debug ./gon.json + # mv coder.zip $artifact + # else artifact="coder-cli-$GOOS-$GOARCH.tar.gz" tar -czf "$artifact" coder echo "--- warning: not in ci, skipping signed release of darwin" - fi + # fi ;; esac popd From e373e9dc492c3d46d9fd7671dd53caf21fe10f84 Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Sat, 7 Nov 2020 23:51:09 -0600 Subject: [PATCH 05/10] fixup! new release action --- .github/workflows/release.yaml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9440b947..cadfac3d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,14 +1,5 @@ on: workflow_dispatch: - inputs: - preRelease: - description: "Pre Release" - required: true - default: "false" - draft: - description: "Draft Release" - required: true - default: "false" name: Create Github Release jobs: build: @@ -43,8 +34,8 @@ jobs: Changes in this Release - First Change - Second Change - draft: ${{ github.event.inputs.draft == 'true' }} - prerelease: ${{ github.event.inputs.preRelease == 'true' }} + draft: true + prerelease: false - name: Upload Windows Release id: upload-release-asset uses: actions/upload-release-asset@v1 From ecc67360b035e347bd2c177faad0983d42bf933c Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Sat, 7 Nov 2020 23:52:13 -0600 Subject: [PATCH 06/10] fixup! new release action --- .github/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cadfac3d..499dcbe3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -37,7 +37,7 @@ jobs: draft: true prerelease: false - name: Upload Windows Release - id: upload-release-asset + id: upload-windows-release-asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -47,7 +47,7 @@ jobs: asset_name: coder-cli-linux-amd64.tar.gz asset_content_type: application/zip - name: Upload MacOS Release - id: upload-release-asset + id: upload-macos-release-asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -57,7 +57,7 @@ jobs: asset_name: coder-cli-darwin-amd64.zip asset_content_type: application/zip - name: Upload Linux Release - id: upload-release-asset + id: upload-linux-release-asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From fe79d33e4358c47db9c8a983e6c7c6e998712a5e Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Sat, 7 Nov 2020 23:53:33 -0600 Subject: [PATCH 07/10] fixup! new release action --- ci/steps/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/steps/build.sh b/ci/steps/build.sh index 3ed5006d..54b19d9d 100755 --- a/ci/steps/build.sh +++ b/ci/steps/build.sh @@ -8,7 +8,8 @@ set -euo pipefail cd "$(git rev-parse --show-toplevel)/ci/steps" -tag=$(git describe --tags) +# tag=$(git describe --tags) +tag=v1.0.0 build() { echo "--- building coder-cli for $GOOS-$GOARCH" From 55d768efc2ee776543208ea78142f102e04e6d5f Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Sat, 7 Nov 2020 23:59:11 -0600 Subject: [PATCH 08/10] fixup! new release action --- .github/workflows/release.yaml | 26 ++++++++++++-------------- ci/steps/build.sh | 15 +++++++-------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 499dcbe3..a569506a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,5 +1,6 @@ on: - workflow_dispatch: + push: + tags: "v*" name: Create Github Release jobs: build: @@ -8,15 +9,15 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v2 - # - name: Install Gon - # run: | - # brew tap mitchellh/gon - # brew install mitchellh/gon/gon - # - name: Import Signing Certificates - # uses: Apple-Actions/import-codesign-certs@v1 - # with: - # p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }} - # p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }} + - name: Install Gon + run: | + brew tap mitchellh/gon + brew install mitchellh/gon/gon + - name: Import Signing Certificates + uses: Apple-Actions/import-codesign-certs@v1 + with: + p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }} + p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }} - name: Build Release Assets run: ./ci/steps/build.sh env: @@ -30,10 +31,7 @@ jobs: with: tag_name: ${{ github.ref }} release_name: Release ${{ github.ref }} - body: | - Changes in this Release - - First Change - - Second Change + body: "" draft: true prerelease: false - name: Upload Windows Release diff --git a/ci/steps/build.sh b/ci/steps/build.sh index 54b19d9d..0017f2b5 100755 --- a/ci/steps/build.sh +++ b/ci/steps/build.sh @@ -8,8 +8,7 @@ set -euo pipefail cd "$(git rev-parse --show-toplevel)/ci/steps" -# tag=$(git describe --tags) -tag=v1.0.0 +tag=$(git describe --tags) build() { echo "--- building coder-cli for $GOOS-$GOARCH" @@ -31,15 +30,15 @@ build() { tar -czf "$artifact" coder ;; "darwin") - # if [[ ${CI-} ]]; then - # artifact="coder-cli-$GOOS-$GOARCH.zip" - # gon -log-level debug ./gon.json - # mv coder.zip $artifact - # else + if [[ ${CI-} ]]; then + artifact="coder-cli-$GOOS-$GOARCH.zip" + gon -log-level debug ./gon.json + mv coder.zip $artifact + else artifact="coder-cli-$GOOS-$GOARCH.tar.gz" tar -czf "$artifact" coder echo "--- warning: not in ci, skipping signed release of darwin" - # fi + fi ;; esac popd From 9ac95cc858687ba5f6991c08531d00a463538730 Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Sun, 8 Nov 2020 14:02:35 -0600 Subject: [PATCH 09/10] fixup! new release action --- .github/workflows/release.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a569506a..54cde9ed 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -34,8 +34,8 @@ jobs: body: "" draft: true prerelease: false - - name: Upload Windows Release - id: upload-windows-release-asset + - name: Upload Linux Release + id: upload-linux-release-asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -43,7 +43,7 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./ci/bin/coder-cli-linux-amd64.tar.gz asset_name: coder-cli-linux-amd64.tar.gz - asset_content_type: application/zip + asset_content_type: application/tar+gzip - name: Upload MacOS Release id: upload-macos-release-asset uses: actions/upload-release-asset@v1 @@ -54,8 +54,8 @@ jobs: asset_path: ./ci/bin/coder-cli-darwin-amd64.zip asset_name: coder-cli-darwin-amd64.zip asset_content_type: application/zip - - name: Upload Linux Release - id: upload-linux-release-asset + - name: Upload Windows Release + id: upload-windows-release-asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -63,4 +63,4 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./ci/bin/coder-cli-windows-386.zip asset_name: coder-cli-windows-386.zip - asset_content_type: application/zip \ No newline at end of file + asset_content_type: application/zip From 6e7cebfaafe1e9d3c462560d7e095441a93d757f Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Mon, 9 Nov 2020 09:36:37 -0600 Subject: [PATCH 10/10] fixup! new release action --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 54cde9ed..64d1e05c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -30,7 +30,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} + release_name: ${{ github.ref }} body: "" draft: true prerelease: false