Skip to content

Commit

Permalink
Merge pull request n0-computer#4 from capyloon/update-iroh
Browse files Browse the repository at this point in the history
Update iroh
  • Loading branch information
fabricedesre authored Nov 9, 2022
2 parents e1d3faa + 8510fbc commit 5f28021
Show file tree
Hide file tree
Showing 1,991 changed files with 174,524 additions and 88,115 deletions.
3 changes: 3 additions & 0 deletions .cargo/config
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ directory = "third-party"

[alias]
xtask = "run --package xtask --"

[target.x86_64-pc-windows-gnu]
linker = "x86_64-w64-mingw32-gcc"
18 changes: 10 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -363,13 +363,14 @@ jobs:
arch: "x86_64"
- set-env-path:
arch: "x86_64"
- setup-sccache:
arch: "x86_64"
- restore-sccache-cache
# - setup-sccache:
# arch: "x86_64"
# - restore-sccache-cache
- aws-cli/setup:
profile-name: default
- run:
name: build x86_64 release
no_output_timeout: 60m
command: cargo build --profile ci -v
- push-to-s3:
path: ./target/ci/
Expand All @@ -379,7 +380,7 @@ jobs:
path: ./target/ci/
os: linux
arch: amd64
- save-sccache-cache
# - save-sccache-cache

build_release_aarch64:
executor: arm-executor
Expand All @@ -390,13 +391,14 @@ jobs:
arch: "aarch_64"
- set-env-path:
arch: "aarch64"
- setup-sccache:
arch: "aarch64"
- restore-sccache-cache
# - setup-sccache:
# arch: "aarch64"
# - restore-sccache-cache
- aws-cli/setup:
profile-name: default
- run:
name: build aarch64 release
no_output_timeout: 60m
command: cargo build --profile ci -v
- push-to-s3:
path: ./target/ci/
Expand All @@ -406,7 +408,7 @@ jobs:
path: ./target/ci/
os: linux
arch: aarch64
- save-sccache-cache
# - save-sccache-cache

build_release_osx:
#executor: mac-executor
Expand Down
24 changes: 23 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,12 @@ jobs:
- name: tests
uses: actions-rs/cargo@v1
timeout-minutes: 30
env:
# iroh-util/src/lock.rs#test_locks uses a fork() command & fails only in
# GHA if this is not present
# https://twitter.com/steipete/status/921066430220652544?lang=en
# https://blog.phusion.nl/2017/10/13/why-ruby-app-servers-break-on-macos-high-sierra-and-what-can-be-done-about-it/
OBJC_DISABLE_INITIALIZE_FORK_SAFETY: YES
with:
command: test
args: --all -j 4
Expand Down Expand Up @@ -204,12 +210,28 @@ jobs:
aws s3 cp ./target/ci/iroh s3://vorc/iroh-${RELEASE_OS}-${RELEASE_ARCH}-${GITHUB_SHA::7} --no-progress
- name: push release latest
if: matrix.os != 'macOS-latest' && matrix.rust=='stable' && github.ref_name=='main'
if: matrix.os == 'macOS-latest' && matrix.rust=='stable' && github.ref_name=='main'
run: |
aws s3 cp ./target/ci/iroh-gateway s3://vorc/iroh-gateway-${RELEASE_OS}-${RELEASE_ARCH}-latest --no-progress
aws s3 cp ./target/ci/iroh-p2p s3://vorc/iroh-p2p-${RELEASE_OS}-${RELEASE_ARCH}-latest --no-progress
aws s3 cp ./target/ci/iroh-store s3://vorc/iroh-store-${RELEASE_OS}-${RELEASE_ARCH}-latest --no-progress
aws s3 cp ./target/ci/iroh s3://vorc/iroh-${RELEASE_OS}-${RELEASE_ARCH}-latest --no-progress
- name: push release aarch64
if: matrix.os == 'macOS-latest' && matrix.rust=='stable' && github.ref_name=='main'
run: |
aws s3 cp ./target/aarch64-apple-darwin/ci/iroh-gateway s3://vorc/iroh-gateway-${RELEASE_OS}-aarch64-${GITHUB_SHA::7} --no-progress
aws s3 cp ./target/aarch64-apple-darwin/ci/iroh-p2p s3://vorc/iroh-p2p-${RELEASE_OS}-aarch64-${GITHUB_SHA::7} --no-progress
aws s3 cp ./target/aarch64-apple-darwin/ci/iroh-store s3://vorc/iroh-store-${RELEASE_OS}-aarch64-${GITHUB_SHA::7} --no-progress
aws s3 cp ./target/aarch64-apple-darwin/ci/iroh s3://vorc/iroh-${RELEASE_OS}-aarch64-${GITHUB_SHA::7} --no-progress
- name: push release latest aarch64
if: matrix.os == 'macOS-latest' && matrix.rust=='stable' && github.ref_name=='main'
run: |
aws s3 cp ./target/aarch64-apple-darwin/ci/iroh-gateway s3://vorc/iroh-gateway-${RELEASE_OS}-aarch64-latest --no-progress
aws s3 cp ./target/aarch64-apple-darwin/ci/iroh-p2p s3://vorc/iroh-p2p-${RELEASE_OS}-aarch64-latest --no-progress
aws s3 cp ./target/aarch64-apple-darwin/ci/iroh-store s3://vorc/iroh-store-${RELEASE_OS}-aarch64-latest --no-progress
aws s3 cp ./target/aarch64-apple-darwin/ci/iroh s3://vorc/iroh-${RELEASE_OS}-aarch64-latest --no-progress
- name: Print sccache stats
run: sccache --show-stats
Expand Down
231 changes: 231 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

Loading

0 comments on commit 5f28021

Please sign in to comment.