remove darwin builds, disable goreleaser github releasers, re-add .github/workflows/release.yaml

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: a629d38a2273aa0cd43b7f06702c8c631401f30c

Author: joelanford

staging/operator-registry/.github/workflows/goreleaser.yaml

@@ -23,29 +23,6 @@ jobs:
         with:
           go-version: '~1.16'
 
-      - name: "Download osxcross cross-compiler for macOS builds"
-        run: |
-          git clone https://github.com/tpoechtrager/osxcross /tmp/osxcross
-          cd /tmp/osxcross
-          wget -P tarballs '<REPLACE_ME_WITH_SECRET_PATH_TO_MACOS_SDK>'
-          echo "/tmp/osxcross/target/bin" >> $GITHUB_PATH
-
-      - name: "Cache the osxcross + tarball build output"
-        id: cache-osxcross
-        uses: actions/cache@v2
-        with:
-          path: /tmp/osxcross/target
-          key: ${{ runner.os }}-osxcross-${{ hashFiles('/tmp/osxcross/**/*') }}
-          restore-keys: |
-            ${{ runner.os }}-osxcross-
-
-      - name: "Build osxcross"
-        if: steps.cache-osxcross.outputs.cache-hit != 'true'
-        run: |
-          cd /tmp/osxcross
-          sudo ./tools/get_dependencies.sh
-          UNATTENDED=1 ./build.sh
-
       - name: "Install linux cross-compilers"
         run: sudo apt-get install -y gcc-aarch64-linux-gnu gcc-s390x-linux-gnu gcc-powerpc64le-linux-gnu gcc-mingw-w64-x86-64
 

staging/operator-registry/.github/workflows/release.yaml

@@ -0,0 +1,48 @@
+name: release
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+defaults:
+  run:
+    shell: bash
+jobs:
+  create:
+    runs-on: ubuntu-latest
+    outputs:
+      upload_url: ${{ steps.release.outputs.upload_url }}
+    steps:
+      - uses: actions/create-release@v1
+        id: release
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          draft: true
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+  assets:
+    needs: create
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '~1.16'
+      - run: |
+          echo "asset_path=bin/opm" >> $GITHUB_ENV
+          echo "asset_name=$(go env GOOS)-$(go env GOARCH)-opm$(go env GOEXE)" >> $GITHUB_ENV
+      - run: make ${{ env.asset_path }}
+      - uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ needs.create.outputs.upload_url }}
+          asset_path: ${{ env.asset_path }}
+          asset_name: ${{ env.asset_name }}
+          asset_content_type: application/octet-stream

staging/operator-registry/.goreleaser.yaml

@@ -76,34 +76,6 @@ builds:
     asmflags: *build-asmflags
     gcflags: *build-gcflags
     ldflags: *build-ldflags
-  - id: darwin-amd64
-    main: ./cmd/opm
-    binary: opm
-    goos:
-      - darwin
-    goarch:
-      - amd64
-    env:
-      - CC=o64-clang
-    mod_timestamp: "{{ .CommitTimestamp }}"
-    flags: *build-flags
-    asmflags: *build-asmflags
-    gcflags: *build-gcflags
-    ldflags: *build-ldflags
-  - id: darwin-arm64
-    main: ./cmd/opm
-    binary: opm
-    goos:
-      - darwin
-    goarch:
-      - arm64
-    env:
-      - CC=oa64e-clang
-    mod_timestamp: "{{ .CommitTimestamp }}"
-    flags: *build-flags
-    asmflags: *build-asmflags
-    gcflags: *build-gcflags
-    ldflags: *build-ldflags
 archives:
   - id: opm
     builds:
@@ -112,8 +84,6 @@ archives:
       - linux-ppc64le
       - linux-s390x
       - windows-amd64
-      - darwin-amd64
-      - darwin-arm64
     name_template: "{{ .Binary }}_{{ .Env.OPM_VERSION }}_{{ .Os }}_{{ .Arch }}"
     format: binary
 dockers:
@@ -171,3 +141,6 @@ snapshot:
 release:
   name_template: "{{ .Env.OPM_VERSION }}"
   draft: true
+  ## Disable release steps, since a separate GitHub Action job
+  ## handles binary builds and release uploads
+  disable: true