Skip to content

Commit

Permalink
Clean up actions and workflows from cbindgen
Browse files Browse the repository at this point in the history
  • Loading branch information
albin-mullvad committed Sep 20, 2024
1 parent 5439b56 commit 25158ba
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 16 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/android-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,6 @@ jobs:
RUSTFLAGS: --deny warnings
BUILD_TYPE: debug
run: |
# Temporary fix to address maybenot.h build issues.
cargo install --force cbindgen --version "0.26.0"
ARCHITECTURES="${{ matrix.abi }}"
UNSTRIPPED_LIB_PATH="$CARGO_TARGET_DIR/${{ matrix.target }}/$BUILD_TYPE/libmullvad_jni.so"
STRIPPED_LIB_PATH="./android/app/build/extraJni/${{ matrix.abi }}/libmullvad_jni.so"
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/rust-unused-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,6 @@ jobs:
git config --global --add safe.directory '*'
git submodule update --init --recursive --depth=1 wireguard-go-rs
- name: Install cbindgen
run: |
# Temporary fix to address maybenot.h build issues.
# Remove this step when cbindgen has been added to the build container.
cargo install --force cbindgen --version "0.26.0"
- name: Install nightly Rust toolchain
run: |
rustup default $RUST_NIGHTLY_TOOLCHAIN
Expand Down
8 changes: 0 additions & 8 deletions build-apk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,6 @@ mkdir -p "app/build/extraAssets"
mkdir -p "app/build/extraJni"
popd

# Temporary fix to address maybenot.h (checked in) sometimes needing to be
# re-generated due to how `make` looks at last-modifications while git neither
# stores nor consistently sets modification metadata on file checkout.
#
# NOTE: The version should match the one used in the checked in
# maybenot.h file.
cargo install --force cbindgen --version "0.26.0"

for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do
case "$ARCHITECTURE" in
"x86_64")
Expand Down

0 comments on commit 25158ba

Please sign in to comment.