Merge branch 'next'

Govcraft · Jun 29, 2024 · b68a989 · b68a989
2 parents 6a5c8f4 + fa77c4f
commit b68a989
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,32 +19,31 @@ jobs:
             target: x86_64-pc-windows-msvc
             bin: ntangler.exe
             name: ntangler-Windows-x86_64.zip
-            command: both
+            command: build
 
-          # - release_for: macOS-x86_64
-          #   os: macOS-latest
-          #   target: x86_64-apple-darwin
-          #   bin: ntangler
-          #   name: ntangler-Darwin-x86_64.tar.gz
-          #   command: both
+          - release_for: macOS-x86_64
+            os: macOS-latest
+            target: x86_64-apple-darwin
+            bin: ntangler
+            name: ntangler-Darwin-x86_64.tar.gz
+            command: build
     runs-on: ${{ matrix.platform.os }}
     steps:
       - name: Check out repo
         uses: actions/checkout@v4
         with:
           fetch-tags: true
           fetch-depth: 0
+          branch: "test-workflow"
           repository: "Govcraft/ntangler"
           token: "${{ secrets.PAT }}"
-      - name: Enter src dir
-        run: "cd ./ntangler"
       - name: Build binary
         uses: houseabsolute/actions-rust-cross@v0
         with:
           SRC_DIR: "./ntangler"
           command: ${{ matrix.platform.command }}
           target: ${{ matrix.platform.target }}
-          args: "--release"
+          args: "--locked --release"
           strip: true
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,12 +7,16 @@ edition = "2021"
 name = "ntangler"
 path = "src/main.rs"
 
+[dependencies.openssl-sys]
+version = "0.9"
+features = ["vendored"]
+
 [features]
 demo = []
 
 [dependencies]
 git2 = "0.19.0"
-reqwest = { version = "0.12.4", features = ["json"] }
+reqwest = { version = "0.12.4", features = ["json", "rustls-tls"] }
 serde = { version = "1.0.203", features = ["derive"] }
 tokio = { version = "1.38.0", features = ["full"] }
 toml = "0.8.13"