From 5ef226b0714148e8678585ffb37f6391feeb16bc Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Tue, 29 Nov 2022 15:24:04 -0500 Subject: [PATCH] Fix libacl CI error and make CI simpler --- .github/workflows/ci-python.yml | 4 +-- .github/workflows/ci.yml | 42 ++++++------------------------- .github/workflows/pip-release.yml | 7 ++++++ .github/workflows/release.yml | 17 ++----------- 4 files changed, 19 insertions(+), 51 deletions(-) diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml index 022c339b..d04d8e24 100644 --- a/.github/workflows/ci-python.yml +++ b/.github/workflows/ci-python.yml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Install Cap'n Proto and libacl-dev + - name: Install libacl-dev run: | export DEBIAN_FRONTEND=noninteractive - sudo apt-get install -y capnproto libcapnp-dev libacl1-dev + sudo apt-get install -y libacl1-dev - uses: actions/setup-python@v2 with: python-version: 3.8 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 108bbcfb..b9e5624a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,24 +16,11 @@ jobs: timeout-minutes: 30 steps: - uses: actions/checkout@v3 - - name: Install Cap'n Proto and libacl-dev (Linux) + - name: Install libacl-dev (Linux) if: runner.os == 'Linux' run: | export DEBIAN_FRONTEND=noninteractive - sudo apt-get install -y capnproto libcapnp-dev libacl1-dev - - name: Install Cap'n Proto (macOS) - if: runner.os == 'macOS' - run: brew install capnp - env: - HOMEBREW_NO_AUTO_UPDATE: 1 - HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 1 - HOMEBREW_NO_INSTALL_CLEANUP: 1 - - name: Install Cap'n Proto (Windows) - if: runner.os == 'Windows' - shell: pwsh - run: | - choco install capnproto - echo "$Env:Programfiles\capnproto" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + sudo apt-get install -y libacl1-dev - uses: r7kamura/rust-problem-matchers@v1.1.0 - run: cargo --version --verbose @@ -56,24 +43,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install Cap'n Proto and libacl-dev (Linux) + - name: Install libacl-dev (Linux) if: runner.os == 'Linux' run: | export DEBIAN_FRONTEND=noninteractive - sudo apt-get install -y capnproto libcapnp-dev libacl1-dev - - name: Install Cap'n Proto (macOS) - if: runner.os == 'macOS' - run: brew install capnp - env: - HOMEBREW_NO_AUTO_UPDATE: 1 - HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 1 - HOMEBREW_NO_INSTALL_CLEANUP: 1 - - name: Install Cap'n Proto (Windows) - if: runner.os == 'Windows' - shell: pwsh - run: | - choco install capnproto - echo "$Env:Programfiles\capnproto" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + sudo apt-get install -y libacl1-dev - uses: r7kamura/rust-problem-matchers@v1.1.0 - run: cargo --version --verbose @@ -108,11 +82,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install Cap'n Proto and libacl-dev (Linux) + - name: Install libacl-dev (Linux) if: runner.os == 'Linux' run: | export DEBIAN_FRONTEND=noninteractive - sudo apt-get install -y capnproto libcapnp-dev libacl1-dev + sudo apt-get install -y libacl1-dev - uses: r7kamura/rust-problem-matchers@v1.1.0 - run: cargo --version --verbose @@ -127,10 +101,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Install Cap'n Proto and libacl-dev + - name: Install libacl-dev run: | export DEBIAN_FRONTEND=noninteractive - sudo apt-get install -y capnproto libcapnp-dev libacl1-dev + sudo apt-get install -y libacl1-dev - uses: r7kamura/rust-problem-matchers@v1.1.0 - run: cargo --version --verbose diff --git a/.github/workflows/pip-release.yml b/.github/workflows/pip-release.yml index cc6f0eb1..6c134b7f 100644 --- a/.github/workflows/pip-release.yml +++ b/.github/workflows/pip-release.yml @@ -21,6 +21,13 @@ jobs: steps: - uses: actions/checkout@v3 + + - name: Install libacl-dev (Linux) + if: runner.os == 'Linux' + run: | + export DEBIAN_FRONTEND=noninteractive + sudo apt-get install -y libacl1-dev + - uses: r7kamura/rust-problem-matchers@v1.1.0 # Publish Dora Node Python API diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c690b1d8..1074a407 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,24 +22,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install Cap'n Proto and libacl-dev (Linux) + - name: Install libacl-dev (Linux) if: runner.os == 'Linux' run: | export DEBIAN_FRONTEND=noninteractive - sudo apt-get install -y capnproto libcapnp-dev libacl1-dev - - name: Install Cap'n Proto (macOS) - if: runner.os == 'macOS' - run: brew install capnp - env: - HOMEBREW_NO_AUTO_UPDATE: 1 - HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 1 - HOMEBREW_NO_INSTALL_CLEANUP: 1 - - name: Install Cap'n Proto (Windows) - if: runner.os == 'Windows' - shell: pwsh - run: | - choco install capnproto - echo "$Env:Programfiles\capnproto" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + sudo apt-get install -y libacl1-dev - uses: r7kamura/rust-problem-matchers@v1.1.0