From 502dc355087dd4ff1edee53df19fae33157550e5 Mon Sep 17 00:00:00 2001
From: jsd1982 <james.jdunne@gmail.com>
Date: Sat, 12 Mar 2022 12:54:52 -0600
Subject: [PATCH] github: different archive formats per target OS

---
 .github/workflows/main.yml    | 45 ++++++++++++++++++++++++-----------
 .github/workflows/release.yml | 38 ++++++++++++++++++++---------
 2 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4bb3827..6be3ecc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,12 +27,13 @@ jobs:
 
   release-matrix:
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         include:
           - os: macos-latest
             goos: darwin
             goarch: amd64
+            suffix: tar.gz
           #- os: macos-latest
           #  goos: darwin
           #  goarch: arm64
@@ -40,13 +41,16 @@ jobs:
             goos: windows
             goarch: amd64
             exesuffix: .exe
+            suffix: zip
           - os: windows-latest
             goos: windows
             goarch: "386"
             exesuffix: .exe
+            suffix: zip
           - os: ubuntu-latest
             goos: linux
             goarch: amd64
+            suffix: tar.xz
           #- os: ubuntu-latest
           #  goos: linux
           #  goarch: "386"
@@ -118,20 +122,33 @@ jobs:
         run: >
           GOARCH=${{matrix.goarch}} go build
           -ldflags="-X 'main.version=${{env.GITHUB_REF_SLUG}}' -X 'main.commit=${{env.GITHUB_SHA_SHORT}}' -X 'main.date=$(date +'%Y-%m-%dT%H:%M:%S')'"
-          -o ./${{env.basename}}/sni${{matrix.exesuffix}}
+          -o ./${{env.basename}}/sni
           ./cmd/sni
 
       # cross-platform tar.gz creator:
-      - name: Create ${{env.basename}}.tar.gz
-        run: >
-          go run
-          .github/scripts/tar.go
-          -z
-          -o ${{env.basename}}.tar.gz
-          -strip ${{env.basename}}/
-          ${{env.basename}}/
-
-      - uses: actions/upload-artifact@v1
+      #- name: Create ${{env.basename}}.tar.gz
+      #  run: >
+      #    go run
+      #    .github/scripts/tar.go
+      #    -z
+      #    -o ${{env.basename}}.tar.gz
+      #    -strip ${{env.basename}}/
+      #    ${{env.basename}}/
+
+      - name: Package ${{env.basename}}.${{matrix.suffix}}
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: tar czf ${{env.basename}}.${{matrix.suffix}} ${{env.basename}}/
+
+      - name: Package ${{env.basename}}.${{matrix.suffix}}
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: Compress-Archive -DestinationPath ${{env.basename}}.${{matrix.suffix}} -Path ${{env.basename}}/*
+
+      - name: Package ${{env.basename}}.${{matrix.suffix}}
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: tar cJf ${{env.basename}}.${{matrix.suffix}} ${{env.basename}}/
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v1
         with:
-          name: ${{env.basename}}.tar.gz
-          path: ${{ github.workspace }}/${{env.basename}}.tar.gz
+          name: ${{env.basename}}.${{matrix.suffix}}
+          path: ${{github.workspace}}/${{env.basename}}.${{matrix.suffix}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 75335a2..8cf7fe2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,6 +32,7 @@ jobs:
           - os: macos-latest
             goos: darwin
             goarch: amd64
+            suffix: tar.gz
           #- os: macos-latest
           #  goos: darwin
           #  goarch: arm64
@@ -39,13 +40,16 @@ jobs:
             goos: windows
             goarch: amd64
             exesuffix: .exe
+            suffix: zip
           - os: windows-latest
             goos: windows
             goarch: "386"
             exesuffix: .exe
+            suffix: zip
           - os: ubuntu-latest
             goos: linux
             goarch: amd64
+            suffix: tar.xz
           #- os: ubuntu-latest
           #  goos: linux
           #  goarch: "386"
@@ -117,18 +121,30 @@ jobs:
         run: >
           GOARCH=${{matrix.goarch}} go build
           -ldflags="-X 'main.version=${{env.GITHUB_REF_SLUG}}' -X 'main.commit=${{env.GITHUB_SHA_SHORT}}' -X 'main.date=$(date +'%Y-%m-%dT%H:%M:%S')'"
-          -o ./${{env.basename}}/sni${{matrix.exesuffix}}
+          -o ./${{env.basename}}/sni
           ./cmd/sni
 
       # cross-platform tar.gz creator:
-      - name: Create ${{env.basename}}.tar.gz
-        run: >
-          go run
-          .github/scripts/tar.go
-          -z
-          -o ${{env.basename}}.tar.gz
-          -strip ${{env.basename}}/
-          ${{env.basename}}/
+      #- name: Create ${{env.basename}}.tar.gz
+      #  run: >
+      #    go run
+      #    .github/scripts/tar.go
+      #    -z
+      #    -o ${{env.basename}}.tar.gz
+      #    -strip ${{env.basename}}/
+      #    ${{env.basename}}/
+
+      - name: Package ${{env.basename}}.${{matrix.suffix}}
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: tar czf ${{env.basename}}.${{matrix.suffix}} ${{env.basename}}/
+
+      - name: Package ${{env.basename}}.${{matrix.suffix}}
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: Compress-Archive -DestinationPath ${{env.basename}}.${{matrix.suffix}} -Path ${{env.basename}}/*
+
+      - name: Package ${{env.basename}}.${{matrix.suffix}}
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: tar cJf ${{env.basename}}.${{matrix.suffix}} ${{env.basename}}/
 
       - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v2
@@ -136,5 +152,5 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ env.GITHUB_REF_SLUG }}
           overwrite: true
-          asset_name: ${{env.basename}}.tar.gz
-          file: ${{ github.workspace }}/${{env.basename}}.tar.gz
+          asset_name: ${{env.basename}}.${{matrix.suffix}}
+          file: ${{ github.workspace }}/${{env.basename}}.${{matrix.suffix}}