From ebe7196a978dccf4873188a2355039b496efc402 Mon Sep 17 00:00:00 2001 From: Asmir Avdicevic Date: Fri, 19 Apr 2024 11:30:38 +0200 Subject: [PATCH] chore: rename derper > iroh-relay (#2211) ## Description Completes the rename of `derper` to `iroh-relay`. Will fail netsim, but should pass again once https://github.com/n0-computer/chuck/pull/54 is merged. ## Breaking Changes ## Notes & open questions ## Change checklist - [ ] Self-review. - [ ] Documentation updates if relevant. - [ ] Tests if relevant. - [ ] All breaking changes documented. --- .github/ansible/redeploy-relay.yml | 8 ++++---- .github/workflows/ci.yml | 4 ++-- .github/workflows/netsim.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- .github/workflows/test_relay_server.yml | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/ansible/redeploy-relay.yml b/.github/ansible/redeploy-relay.yml index 8863aa9c7c..19df714341 100644 --- a/.github/ansible/redeploy-relay.yml +++ b/.github/ansible/redeploy-relay.yml @@ -6,15 +6,15 @@ tasks: - name: Fetch iroh-relay binary get_url: - url: https://vorc.s3.us-east-2.amazonaws.com/derper-linux-amd64-{{ derper_version }} + url: https://vorc.s3.us-east-2.amazonaws.com/iroh-relay-linux-amd64-{{ relay_version }} mode: '0755' force: yes - dest: /usr/local/bin/derper + dest: /usr/local/bin/iroh-relay - name: Allow ports shell: - cmd: sudo setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/derper + cmd: sudo setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/iroh-relay - name: Make sure iroh-relay is started ansible.builtin.systemd: state: restarted enabled: yes - name: derper + name: iroh-relay diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad26bd7712..0c468512fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -218,7 +218,7 @@ jobs: - name: Copy binaries to right location run: | cp target/release/iroh ../chuck/netsim/bins/iroh - cp target/release/iroh-relay ../chuck/netsim/bins/derper + cp target/release/iroh-relay ../chuck/netsim/bins/iroh-relay cp ../chuck/target/release/chuck ../chuck/netsim/bins/chuck - name: Run tests @@ -230,7 +230,7 @@ jobs: sudo python3 main.py ${{ runner.debug && '--debug' || ''}} --integration sims/integration - name: Cleanup run: | - sudo kill -9 $(pgrep derper) || true + sudo kill -9 $(pgrep iroh-relay) || true sudo kill -9 $(pgrep iroh) || true sudo kill -9 $(pgrep ovs) || true sudo mn --clean || true diff --git a/.github/workflows/netsim.yml b/.github/workflows/netsim.yml index 3e7d660443..3e81092a1d 100644 --- a/.github/workflows/netsim.yml +++ b/.github/workflows/netsim.yml @@ -97,7 +97,7 @@ jobs: - name: Copy binaries to right location run: | cp target/optimized-release/iroh ../chuck/netsim/bins/iroh - cp target/optimized-release/iroh-relay ../chuck/netsim/bins/derper + cp target/optimized-release/iroh-relay ../chuck/netsim/bins/iroh-relay cp ../chuck/target/release/chuck ../chuck/netsim/bins/chuck - name: Detect comment commands @@ -132,7 +132,7 @@ jobs: - name: Cleanup run: | - sudo kill -9 $(pgrep derper) || true + sudo kill -9 $(pgrep iroh-relay) || true sudo kill -9 $(pgrep iroh) || true sudo kill -9 $(pgrep ovs) || true sudo mn --clean || true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 14b2b281c5..cc80cf9430 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -127,12 +127,12 @@ jobs: if: matrix.os != 'windows-latest' run: | aws s3 cp ./target/optimized-release/iroh s3://vorc/iroh-${RELEASE_OS}-${RELEASE_ARCH}-${GITHUB_SHA::7} --no-progress - aws s3 cp ./target/optimized-release/iroh-relay s3://vorc/derper-${RELEASE_OS}-${RELEASE_ARCH}-${GITHUB_SHA::7} --no-progress + aws s3 cp ./target/optimized-release/iroh-relay s3://vorc/iroh-relay-${RELEASE_OS}-${RELEASE_ARCH}-${GITHUB_SHA::7} --no-progress aws s3 cp ./target/optimized-release/iroh-dns-server s3://vorc/iroh-dns-server-${RELEASE_OS}-${RELEASE_ARCH}-${GITHUB_SHA::7} --no-progress - name: push release latest if: matrix.os != 'windows-latest' run: | aws s3 cp ./target/optimized-release/iroh s3://vorc/iroh-${RELEASE_OS}-${RELEASE_ARCH}-latest --no-progress - aws s3 cp ./target/optimized-release/iroh-relay s3://vorc/derper-${RELEASE_OS}-${RELEASE_ARCH}-latest --no-progress + aws s3 cp ./target/optimized-release/iroh-relay s3://vorc/iroh-relay-${RELEASE_OS}-${RELEASE_ARCH}-latest --no-progress aws s3 cp ./target/optimized-release/iroh-dns-server s3://vorc/iroh-dns-server-${RELEASE_OS}-${RELEASE_ARCH}-latest --no-progress diff --git a/.github/workflows/test_relay_server.yml b/.github/workflows/test_relay_server.yml index 257fc9a300..ffe19901de 100644 --- a/.github/workflows/test_relay_server.yml +++ b/.github/workflows/test_relay_server.yml @@ -50,7 +50,7 @@ jobs: - name: push release run: | - aws s3 cp ./target/release/iroh-relay s3://vorc/derper-linux-amd64-${GITHUB_SHA::7} --no-progress + aws s3 cp ./target/release/iroh-relay s3://vorc/iroh-relay-linux-amd64-${GITHUB_SHA::7} --no-progress - name: Set iroh-relay tag id: set_tag @@ -72,4 +72,4 @@ jobs: key: ${{ secrets.TEST_DERPER_SSH_PKEY }} inventory: ${{ secrets.TEST_DERPER_INVENTORY }} known_hosts: ${{ secrets.TEST_DERPER_KNOWN_HOSTS }} - options: --extra-vars ansible_ssh_user=root --extra-vars derper_version=${{ needs.build_derper.outputs.set_tag.tag }} + options: --extra-vars ansible_ssh_user=root --extra-vars relay_version=${{ needs.build_relay_server.outputs.set_tag.tag }}