Merge pull request #33 from nervina-labs/develop

Release v0.4.3
nervina-labs · May 10, 2022 · c08a4e4 · c08a4e4
2 parents c0402e5 + 1d4cd91
commit c08a4e4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,37 +16,36 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        build: [linux]
+        build: [linux, macos]
         include:
           - build: linux
             os: ubuntu-20.04
             rust: 1.59.0
-# Wait for macos-12 release
-#          - build: macos
-#            os: macos-11
- #           rust: 1.59.0
+          - build: macos
+            os: macos-12
+            rust: 1.59.0
 
     steps:
       - uses: actions/checkout@v1
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
-#      - name: Install macos dependencies (mysql-client)
-#        run: brew install mysql-client
-#        if: matrix.os == 'macos-11'
+      - name: Install macos dependencies (mysql-client)
+        run: brew install mysql-client
+        if: matrix.os == 'macos-12'
+
+      - name: Install macos dependencies (diesel_cli)
+        run: RUSTFLAGS='-L/usr/local/opt/mysql-client/lib' cargo install diesel_cli --no-default-features --features mysql
+        if: matrix.os == 'macos-12'
 
-#      - name: Install macos dependencies (diesel_cli)
-#        run: RUSTFLAGS='-L/usr/local/opt/mysql-client/lib' cargo install diesel_cli --no-default-features --features mysql
-#        if: matrix.os == 'macos-11'
+      - name: Build macos
+        run: RUSTFLAGS='-L/usr/local/opt/mysql-client/lib' cargo build --verbose --release
+        if: matrix.os == 'macos-12'
 
       - name: Install linux dependencies (libmysqlclient)
         run: sudo apt-get update && sudo apt-get install libmysqlclient-dev
         if: matrix.os == 'ubuntu-20.04'
 
-#      - name: Build macos
-#        run: RUSTFLAGS='-L/usr/local/opt/mysql-client/lib' cargo build --release
- #       if: matrix.os == 'macos-11'
-
       - name: Build ubuntu
         run: cargo build --release
         if: matrix.os == 'ubuntu-20.04'
@@ -58,14 +57,14 @@ jobs:
         run: 7z a -ttar -so -an ./target/release/${{ env.RELEASE_BIN }} | 7z a -si ./artifacts/${{ env.RELEASE_BIN }}-linux-x86_64.tar.gz
         if: matrix.os == 'ubuntu-20.04'
 
- #     - name: Install p7zip
+      - name: Install p7zip
         # 7Zip not available on macOS, install p7zip via homebrew.
- #       run: brew install p7zip
- #       if: matrix.os == 'macos-11'
+        run: brew install p7zip
+        if: matrix.os == 'macos-12'
 
- #     - name: Create archive for MacOS
- #       run: 7z a -tzip ./artifacts/${{ env.RELEASE_BIN }}-mac-x86_64.zip ./target/release/${{ env.RELEASE_BIN }}
- #       if: matrix.os == 'macos-11'
+      - name: Create archive for MacOS
+        run: 7z a -tzip ./artifacts/${{ env.RELEASE_BIN }}-mac-x86_64.zip ./target/release/${{ env.RELEASE_BIN }}
+        if: matrix.os == 'macos-12'
 
       - name: Upload Release Asset
         uses: softprops/action-gh-release@v1
@@ -75,4 +74,4 @@ jobs:
           name: ${{ env.RELEASE_VERSION }}
           files: |
             ./artifacts/${{ env.RELEASE_BIN }}-linux-x86_64.tar.gz
-#            ./artifacts/${{ env.RELEASE_BIN }}-mac-x86_64.zip
+            ./artifacts/${{ env.RELEASE_BIN }}-mac-x86_64.zip
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cota-registry-aggregator"
-version = "0.4.2"
+version = "0.4.3"
 edition = "2018"
 
 [dependencies]