Skip to content

Commit

Permalink
attemp to fix CI & update readme
Browse files Browse the repository at this point in the history
  • Loading branch information
maxicarlos08 committed Aug 23, 2024
1 parent 502f3d2 commit acbbed2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies (Ubuntu)
if: matrix.os == 'ubuntu-latest'
run: sudo apt install -y autopoint
- name: Install dependencies (macOS)
if: matrix.os == 'macos-latest'
run: brew install automake
run: brew install automake libtool
- name: Run tests
run: cargo test -F test --verbose

Expand All @@ -36,7 +36,7 @@ jobs:
shell: msys2 {0}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup MSYS2 and dependencies
uses: msys2/setup-msys2@v2
with:
Expand All @@ -48,6 +48,7 @@ jobs:
mingw-w64-x86_64-libltdl
mingw-w64-x86_64-clang
pkgconf
libtool
- name: Setup Rust
run: rustup default stable-x86_64-pc-windows-gnu
- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "gphoto2"
description = "High-level wrapper for libgphoto2"
version = "3.3.0"
version = "3.3.0" # Remember to also update the version in the README
edition = "2021"
keywords = ["gphoto2", "gphoto", "libgphoto", "camera", "ffi"]
authors = ["Maxicarlos08 <[email protected]>"]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Run `cargo add gphoto2` to add gphoto2 to your project or add this to your `Carg

```toml
[dependencies]
gphoto2 = "1"
gphoto2 = "3.3"
```

#### Install libgphoto2
Expand Down
2 changes: 1 addition & 1 deletion gphoto2-test/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ OUT_DIR=$PWD

if [ ! -d libgphoto2 ] ; then
mkdir libgphoto2
curl -L https://github.com/gphoto/libgphoto2/archive/0c28822d5909f9ff9bc895b5095fcf8c21dac02a.tar.gz | tar -xzv --strip 1 -C libgphoto2
curl -L https://github.com/maxicarlos08/libgphoto2/archive/refs/heads/maxicarlos08/fix-windows-vcamera-build.tar.gz | tar -xzv --strip 1 -C libgphoto2
fi

cd libgphoto2
Expand Down

0 comments on commit acbbed2

Please sign in to comment.