From 5bd5703885cc4efd063490791779a086ab2f888b Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 5 Jan 2023 13:41:15 +0700 Subject: [PATCH] Upgrade deperataed github actions --- .github/workflows/build.yml | 22 +++++++++++----------- .github/workflows/docker.yml | 4 ++-- .github/workflows/style_checks.yml | 6 +++--- src/pir/mod.rs | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ff2a943..e607199 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: matrix: os: [ubuntu-22.04, windows-2022, macos-12] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 name: Checkout onto ${{ runner.os }} - if: runner.os == 'Linux' name: apt install gstreamer @@ -45,26 +45,26 @@ jobs: echo "PKG_CONFIG_PATH=${PKG_CONFIG_PATH}" >> "${GITHUB_ENV}" echo "PKG_CONFIG_GSTREAMER_1_0_PREFIX=${PKG_CONFIG_GSTREAMER_1_0_PREFIX}" >> "${GITHUB_ENV}" - name: Cache cargo registry - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.cargo/registry key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo index - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.cargo/git key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo build if: runner.os != 'macOS' # Random missing crates on macOS, unclear why - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: target key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} - - uses: actions-rs/cargo@v1 + - uses: actions-rs/cargo@v2 with: command: build args: --release --all-features - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: release-${{ matrix.os }} path: "target/release/neolink*" @@ -93,7 +93,7 @@ jobs: # on i686, the pkgconfig path doesn't match the prefix! pkgconfig: i386-linux-gnu steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install basic tools run: | apt-get update @@ -119,7 +119,7 @@ jobs: target: ${{ matrix.target }} profile: minimal - name: Build - uses: actions-rs/cargo@v1 + uses: actions-rs/cargo@v2 with: command: build args: --release --all-features --target=${{ matrix.target }} @@ -127,7 +127,7 @@ jobs: # Retarget pkg-config as described in https://www.freedesktop.org/wiki/Software/pkg-config/CrossCompileProposal/ PKG_CONFIG_ALLOW_CROSS: 1 PKG_CONFIG_LIBDIR: /usr/lib/${{ matrix.pkgconfig }}/pkgconfig - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: release-${{ matrix.arch }}-buster path: "target/${{ matrix.target }}/release/neolink*" @@ -141,7 +141,7 @@ jobs: - "native" steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install latest rust uses: actions-rs/toolchain@v1 with: @@ -155,7 +155,7 @@ jobs: id: toml run: | NEOLINK_VERSION="$(toml get Cargo.toml package.version | sed 's|"||g')" - echo "::set-output name=version::${NEOLINK_VERSION}" + echo "version=${NEOLINK_VERSION}" >> $GITHUB_OUTPUT - name: Download Windows uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a639315..5adc5d9 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -13,11 +13,11 @@ jobs: run: | unset HAS_SECRET if [ -n $SECRET ]; then HAS_SECRET='true' ; fi - echo ::set-output name=HAS_SECRET_TOKEN::${HAS_SECRET} + echo "HAS_SECRET_TOKEN=${HAS_SECRET}" >> $GITHUB_OUTPUT env: SECRET: "${{ secrets.DOCKER_TOKEN }}" - name: Check out the repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 if: ${{ steps.vars.outputs.HAS_SECRET_TOKEN }} - name: Convert username to lower case for docker id: string_user diff --git a/.github/workflows/style_checks.yml b/.github/workflows/style_checks.yml index f187c04..09b3931 100644 --- a/.github/workflows/style_checks.yml +++ b/.github/workflows/style_checks.yml @@ -7,7 +7,7 @@ jobs: name: Clippy runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: apt install gstreamer run: | sudo apt update @@ -33,7 +33,7 @@ jobs: name: Rust-fmt runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: toolchain: nightly @@ -47,7 +47,7 @@ jobs: name: Luacheck runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Run luacheck uses: nebularg/actions-luacheck@v1 with: diff --git a/src/pir/mod.rs b/src/pir/mod.rs index ac56a40..274fccc 100644 --- a/src/pir/mod.rs +++ b/src/pir/mod.rs @@ -25,7 +25,7 @@ pub(crate) use cmdline::Opt; /// /// Opt is the command line options pub(crate) fn main(opt: Opt, config: Config) -> Result<()> { - let mut camera = find_and_connect(&config, &opt.camera)?; + let camera = find_and_connect(&config, &opt.camera)?; camera .pir_set(opt.on)