enabled back macos builds

chips-blockchain · Nov 4, 2021 · f81d347 · f81d347
1 parent f6e299e
commit f81d347
Showing 1 changed file with 67 additions and 105 deletions.
diff --git a/.github/workflows/bet-cd.yml b/.github/workflows/bet-cd.yml
@@ -93,74 +93,74 @@ jobs:
 
 
 
-#   # Build MacOS 64bit build
-#   macos-build-x86_64:
-#     runs-on: macos-latest
+  # Build MacOS 64bit build
+  macos-build-x86_64:
+    runs-on: macos-latest
 
-#     steps:
-#     - name: Checkout code
-#       uses: actions/checkout@v2
-#       with:
-#           ref: 'master'
-#     - run: git fetch --prune --unshallow
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+      with:
+          ref: 'master'
+    - run: git fetch --prune --unshallow
 
-#     - name: Install deps (macOS)
-#       run: |
-#           brew update
-#           brew install zlib
-#           brew install autoconf
-#           brew install automake
-#           brew install libtool
-#           brew install gmp
-#           brew install sqlite
-#           brew install libsodium
-#           brew install gettext
-#           brew install wget
-#           brew install curl
-#           brew install ninja
-#           brew install openssl
-#           brew install libevent
-#           brew install cmake
-#           brew install python3
-#           brew install gnu-sed
-#           brew install pyenv
-#           pip3 install mako
+    - name: Install deps (macOS)
+      run: |
+          brew update
+          brew install zlib
+          brew install autoconf
+          brew install automake
+          brew install libtool
+          brew install gmp
+          brew install sqlite
+          brew install libsodium
+          brew install gettext
+          brew install wget
+          brew install curl
+          brew install ninja
+          brew install openssl
+          brew install libevent
+          brew install cmake
+          brew install python3
+          brew install gnu-sed
+          brew install pyenv
+          pip3 install mako
 
-#     - name: configure
-#       run: ./configure
+    - name: configure
+      run: ./configure
 
-#     - name: make
-#       run: |
-#           export LDFLAGS="-L/usr/local/opt/openssl/lib"
-#           export CPPFLAGS="-I/usr/local/opt/openssl/include"
-#           export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig"
-#           export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
-#           make
+    - name: make
+      run: |
+          export LDFLAGS="-L/usr/local/opt/openssl/lib"
+          export CPPFLAGS="-I/usr/local/opt/openssl/include"
+          export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig"
+          export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
+          make
       
-#     - name: Extract git tag
-#       shell: bash
-#       run: echo "##[set-output name=gittag;]$(echo $(git describe --always))"
-#       id: extract_git_tag
+    - name: Extract git tag
+      shell: bash
+      run: echo "##[set-output name=gittag;]$(echo $(git describe --always))"
+      id: extract_git_tag
 
-#     - name: List files
-#       run: |
-#         pwd && \
-#         tar -czvf bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz privatebet/bet privatebet/cashierd privatebet/config && \
-#         ls -lh bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz
+    - name: List files
+      run: |
+        pwd && \
+        tar -czvf bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz privatebet/bet privatebet/cashierd privatebet/config && \
+        ls -lh bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz
 
-#     - name: Upload bet-macos-x86_64 release files
-#       uses: actions/upload-artifact@v2
-#       with:
-#         name: bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz
-#         path: /Users/runner/work/bet/bet/bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz
+    - name: Upload bet-macos-x86_64 release files
+      uses: actions/upload-artifact@v2
+      with:
+        name: bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz
+        path: /Users/runner/work/bet/bet/bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz
 
 
 
   publish-release:
       name: Publishing CD releases
       runs-on: ubuntu-latest
-#      needs: [linux-build-x86_64, macos-build-x86_64, linux-build-arm64]
-      needs: [linux-build-x86_64, linux-build-arm64]
+      needs: [linux-build-x86_64, macos-build-x86_64, linux-build-arm64]
+      # needs: [linux-build-x86_64, linux-build-arm64]
 
       steps:
         - name: Checkout code
@@ -198,8 +198,8 @@ jobs:
           run: |
             pwd && \
             ls -lh /home/runner/work/bet/bet/artifacts/bet-linux-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz/bet-linux-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz && \
-            ls -lh /home/runner/work/bet/bet/artifacts/bet-linux-aarch64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz/bet-linux-aarch64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz
-            #ls -lh /home/runner/work/bet/bet/artifacts/bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz/bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz
+            ls -lh /home/runner/work/bet/bet/artifacts/bet-linux-aarch64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz/bet-linux-aarch64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz && \
+            ls -lh /home/runner/work/bet/bet/artifacts/bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz/bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz
 
         - name: Create Release
           id: create_release
@@ -239,52 +239,14 @@ jobs:
             asset_name: bet-linux-aarch64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz
             asset_content_type: application/gzip
 
-#         - name: Upload MacOS Release Asset
-#           id: upload-macos-release-asset 
-#           uses: actions/upload-release-asset@latest
-#           env:
-#             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#           with:
-#             upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
-#             asset_path: /home/runner/work/bet/bet/artifacts/bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz/bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz
-#             asset_name: bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz
-#             asset_content_type: application/gzip
-
-
-
-  # linux-build-aarch64:
-  #   runs-on: ubuntu-18.04
-
-  #   steps:
-  #   - name: Checkout code
-  #     uses: actions/checkout@v2
-  #     with:
-  #         ref: 'master'
-  #   - run: git fetch --prune --unshallow
-
-  #   # - name: apt update
-  #   #   run: sudo apt update
-
-  #   - name: Enable Docker multiarch
-  #     run: |
-  #         sudo apt-get install -y qemu binfmt-support qemu-user-static && \
-  #         docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-
-  #   - name: Build aarch64 binaries
-  #     run: ./tools/build_aarch64.sh
-
-  #   - name: Extract git tag
-  #     shell: bash
-  #     run: echo "##[set-output name=branch;]$(echo $(git describe --always))"
-  #     id: extract_git_tag
-
-  #   - name: List dist files
-  #     run: |
-  #       pwd && \
-  #       ls -lh dist/
+        - name: Upload MacOS Release Asset
+          id: upload-macos-release-asset 
+          uses: actions/upload-release-asset@latest
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          with:
+            upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+            asset_path: /home/runner/work/bet/bet/artifacts/bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz/bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz
+            asset_name: bet-macos-x86_64-${{ steps.extract_git_tag.outputs.gittag }}.tar.gz
+            asset_content_type: application/gzip
 
-  #   - name: Upload bet-linux aarch64 release files
-  #     uses: actions/upload-artifact@v2
-  #     with:
-  #       name: bet-linux-aarch64-${{ steps.extract_git_tag.outputs.branch }}.tar.gz
-  #       path: /home/runner/work/bet/bet/dist/bet-linux-aarch64-${{ steps.extract_git_tag.outputs.branch }}.tar.gz