Skip to content

Commit

Permalink
feat(deps): update from trust-dns-resolver to hickory-resolver (n0-co…
Browse files Browse the repository at this point in the history
…mputer#2033)

Same code, different name, for details see
hickory-dns/hickory-dns#2051.
  • Loading branch information
dignifiedquire authored and fubuloubu committed Feb 21, 2024
1 parent 74f0724 commit 5b1c635
Show file tree
Hide file tree
Showing 5 changed files with 304 additions and 277 deletions.
35 changes: 15 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,7 @@ jobs:
SCCACHE_GHA_ENABLED: "on"
steps:
- uses: actions/checkout@v4
# Can be switched back to stable once 1.75 lands
# https://github.com/rust-lang/cargo/issues/12115#issuecomment-1768170381
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2023-12-06
components: clippy
- uses: dtolnay/rust-toolchain@stable
- name: Install sccache
uses: mozilla-actions/sccache-action@v0.0.4

Expand Down Expand Up @@ -169,7 +164,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install rust stable
uses: dtolnay/rust-toolchain@stable

Expand All @@ -187,7 +182,7 @@ jobs:
git clone https://github.com/n0-computer/chuck.git
cd chuck
cargo build --release
- name: Install netsim deps
run: |
cd ../chuck/netsim
Expand All @@ -213,17 +208,17 @@ jobs:
sudo kill -9 $(pgrep iroh) || true
sudo kill -9 $(pgrep ovs) || true
sudo mn --clean || true
- name: Setup Environment (PR)
if: ${{ github.event_name == 'pull_request' }}
shell: bash
run: |
- name: Setup Environment (PR)
if: ${{ github.event_name == 'pull_request' }}
shell: bash
run: |
echo "LAST_COMMIT_SHA=$(git rev-parse --short ${{ github.event.pull_request.head.sha }})" >> ${GITHUB_ENV}
echo "HEAD_REF=${{ github.event.pull_request.head.ref }}" >> ${GITHUB_ENV}
- name: Setup Environment (Push)
if: ${{ github.event_name == 'push' || github.event_name == 'merge_group' }}
shell: bash
run: |
- name: Setup Environment (Push)
if: ${{ github.event_name == 'push' || github.event_name == 'merge_group' }}
shell: bash
run: |
echo "LAST_COMMIT_SHA=$(git rev-parse --short ${GITHUB_SHA})" >> ${GITHUB_ENV}
echo "HEAD_REF=${{ github.head_ref }}" >> ${GITHUB_ENV}
Expand All @@ -240,7 +235,7 @@ jobs:
export AWS_ACCESS_KEY_ID=${{secrets.S3_ACCESS_KEY_ID}}
export AWS_SECRET_ACCESS_KEY=${{secrets.S3_ACCESS_KEY}}
export AWS_DEFAULT_REGION=us-west-2
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
unzip -q awscliv2.zip
sudo ./aws/install --update
Expand All @@ -256,7 +251,7 @@ jobs:
cd ../chuck/netsim
d=$(cat report_metro.txt)
metro_data=$(printf "%s\n " "$d")
echo "$metro_data"
echo "$metro_data"
d=$(cat report_metro_integration.txt)
metro_data=$(printf "%s\n " "$d")
echo "$metro_data"
echo "$metro_data"
Loading

0 comments on commit 5b1c635

Please sign in to comment.