gh action cleanup

tembo-io · Jan 3, 2024 · 6a4d888 · 6a4d888
1 parent bf2a3c9
commit 6a4d888
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/.github/workflows/tembo_release.yml b/.github/workflows/tembo_release.yml
@@ -54,26 +54,15 @@ jobs:
           cargo build --release --target=${{ matrix.target }}
           git config --global --add safe.directory '*'
 
-      - name: CLI version Mac
+      - name: CLI version
         working-directory: ./tembo-cli
-        id: cli_version_mac
-        run: |
-          set -x
-          cargo install cargo-get
-          TEMBO_CLI_NAME=$(cargo-get package.name)-$(cargo-get package.version)
-          echo "TEMBO_CLI_NAME=$TEMBO_CLI_NAME" >> $GITHUB_ENV
-        if: matrix.os == 'macos-latest'
-
-      - name: CLI version Ubuntu
-        working-directory: ./tembo-cli
-        id: cli_version_ubuntu
+        id: cli_version
         run: |
           set -x
           PKG_VERSION=$(awk -F ' = ' '$$1 ~ /version/ { gsub(/[\\"]/, "", $$2); printf("%s",$$2); exit; }' Cargo.toml)
           TEMBO_VERSION=${PKG_VERSION#"version ="}
           TEMBO_CLI_NAME=tembo-cli-${TEMBO_VERSION}
           echo "TEMBO_CLI_NAME=$TEMBO_CLI_NAME" >> $GITHUB_ENV
-        if: matrix.os == 'ubuntu-20.04'
 
       - name: Generate changelog
         id: changelog

diff --git a/tembo-cli/Cargo.toml b/tembo-cli/Cargo.toml
@@ -56,15 +56,15 @@ controller = "0.26.1"
 sqlx = { version = "0.7.3", features = ["runtime-tokio-native-tls", "postgres", "chrono", "json"] }
 base64 = "0.21.5"
 
-[target.'cfg(macos)'.dependencies]
-openssl = { version = "0.10", features = ["vendored"] }
-
 [target.aarch64-unknown-linux-musl.dependencies]
 openssl = { version = "0.10", features = ["vendored"] }
 
 [target.aarch64-apple-darwin.dependencies]
 openssl = { version = "0.10", features = ["vendored"] }
 
+[target.x86_64-apple-darwin.dependencies]
+openssl = { version = "0.10", features = ["vendored"] }
+
 [dev-dependencies]
 assert_cmd = "2.0.8"
 predicates = "2.1.5"