Skip to content

Commit e31c696

Browse files
committed
Chore: Update build workflow for consistency
Refactor the build workflow to ensure consistent formatting and reduce redundancy in the installation steps across different operating systems.
1 parent 6eb5f5a commit e31c696

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
target: x86_64-pc-windows-gnu
2222
package_type: windows
2323
- os: macos-latest
24-
target: x86_64-apple-darwin
24+
target: aarch64-apple-darwin
2525
package_type: mac
2626

2727
steps:
@@ -56,13 +56,11 @@ jobs:
5656
if: matrix.os == 'macos-latest'
5757
run: |
5858
brew update
59-
brew install openssl@3 rustup-init pkg-config llvm
59+
brew install openssl@3 pkg-config
6060
echo "OPENSSL_DIR=$(brew --prefix openssl@3)" >> $GITHUB_ENV
6161
echo "OPENSSL_LIB_DIR=$(brew --prefix openssl@3)/lib" >> $GITHUB_ENV
6262
echo "OPENSSL_INCLUDE_DIR=$(brew --prefix openssl@3)/include" >> $GITHUB_ENV
63-
echo "MACOSX_DEPLOYMENT_TARGET=10.12" >> $GITHUB_ENV
64-
echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
65-
echo "CXX=$(brew --prefix llvm)/bin/clang++" >> $GITHUB_ENV
63+
echo "MACOSX_DEPLOYMENT_TARGET=11.0" >> $GITHUB_ENV
6664
6765
- name: Install dependencies (Windows)
6866
if: matrix.os == 'windows-latest'
@@ -74,6 +72,9 @@ jobs:
7472
run: cargo build --release --locked --target ${{ matrix.target }} --manifest-path app/Cargo.toml
7573
env:
7674
PKG_CONFIG_ALLOW_CROSS: 1
75+
OPENSSL_DIR: ${{ env.OPENSSL_DIR }}
76+
OPENSSL_LIB_DIR: ${{ env.OPENSSL_LIB_DIR }}
77+
OPENSSL_INCLUDE_DIR: ${{ env.OPENSSL_INCLUDE_DIR }}
7778

7879
- name: Package Debian (.deb)
7980
if: matrix.package_type == 'deb'
@@ -88,7 +89,7 @@ jobs:
8889
run: |
8990
cargo install cargo-wix --force
9091
cd app
91-
cargo wix -- --release --target ${{ matrix.target }}
92+
cargo wix --release
9293
shell: bash
9394

9495
- name: Package macOS (.dmg)
@@ -99,18 +100,16 @@ jobs:
99100
env:
100101
BUNDLE_ID: com.singhropar.gitswift
101102
BUNDLE_NAME: gitswift
102-
MACOSX_DEPLOYMENT_TARGET: 10.12
103+
MACOSX_DEPLOYMENT_TARGET: 11.0
103104
OPENSSL_DIR: ${{ env.OPENSSL_DIR }}
104105
OPENSSL_LIB_DIR: ${{ env.OPENSSL_LIB_DIR }}
105106
OPENSSL_INCLUDE_DIR: ${{ env.OPENSSL_INCLUDE_DIR }}
106-
CC: ${{ env.CC }}
107-
CXX: ${{ env.CXX }}
108107

109108
- name: Upload Artifacts
110109
uses: actions/upload-artifact@v4
111110
with:
112111
name: packages-${{ matrix.os }}
113112
path: |
114-
app/target/${{ matrix.target }}/release/*.deb
115-
target/wix/*.msi
116-
app/target/release/bundle/dmg/*.dmg
113+
app/target/${{ matrix.target }}/debian/*.deb
114+
app/target/wix/*.msi
115+
app/target/release/bundle/dmg/*.dmg

0 commit comments

Comments
 (0)