Skip to content

Commit

Permalink
Merge branch 'master' into staszek/yagna-2638/cleanup-rinkeby
Browse files Browse the repository at this point in the history
  • Loading branch information
kamirr committed Sep 25, 2023
2 parents 9f9ecb1 + e96ea4a commit a5a3a90
Show file tree
Hide file tree
Showing 78 changed files with 4,478 additions and 3,634 deletions.
10 changes: 8 additions & 2 deletions .env-template
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,15 @@ YAGNA_DATADIR="."
#ACCOUNT_LIST="${YAGNA_DATADIR}/accounts.json"
#PAYMENT_SHUTDOWN_TIMEOUT_SECS=10

## All drivers
#RINKEBY_GETH_ADDR=http://1.geth.testnet.golem.network:55555
### All drivers

## Set list of Ethereum nodes used by payment driver for specified networks.
## By default payment driver will query nodes addresses from DNS record `{network_name}.rpc-node.dev.golem.network`.
## Setting any of these variables will disable DNS lookup mechanism and use custom list of nodes instead for chosen network.
#MAINNET_GETH_ADDR=https://geth.golem.network:55555
#GOERLI_GETH_ADDR=https://rpc.ankr.com/eth_goerli
#POLYGON_GETH_ADDR=https://bor.golem.network,https://polygon-rpc.com
#MUMBAI_GETH_ADDR=https://matic-mumbai.chainstacklabs.com

## ERC20 driver.
#ETH_FAUCET_ADDRESS=http://faucet.testnet.golem.network:4000/donate
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/binaries-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
- master
- release/*

env:
rust_stable: 1.71.1

jobs:
build:
name: Build binaries (aarch64)
Expand All @@ -23,7 +26,7 @@ jobs:
- name: Setup toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
toolchain: ${{ env.rust_stable }}
target: aarch64-unknown-linux-musl
override: true

Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/binaries-x86-64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- release/*

env:
rust_stable: 1.68.2
rust_stable: 1.71.1

jobs:
build:
Expand Down Expand Up @@ -67,11 +67,7 @@ jobs:
- name: Build binaries
run: |
cargo build --features static-openssl --target x86_64-unknown-linux-musl
(cd core/gftp && cargo build --bin gftp -p gftp --features bin --target x86_64-unknown-linux-musl)
(cd golem_cli && cargo build --bin golemsp -p golemsp --target x86_64-unknown-linux-musl)
(cd agent/provider && cargo build --bin ya-provider -p ya-provider --target x86_64-unknown-linux-musl)
(cd exe-unit && cargo build --bin exe-unit -p ya-exe-unit --features openssl/vendored --target x86_64-unknown-linux-musl)
cargo build --features static-openssl --target x86_64-unknown-linux-musl -p yagna -p ya-exe-unit -p gftp -p golemsp -p ya-provider
- name: Copy binaries
shell: bash
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

integration-test-groups:
name: Integration Tests (hybrid-net) group
runs-on: [goth, ubuntu-18.04]
runs-on: [goth2, ubuntu-22.04]
needs: test_check
strategy:
matrix:
Expand All @@ -48,17 +48,16 @@ jobs:
- name: Configure Python
uses: actions/setup-python@v2
with:
python-version: "3.8.0"
python-version: "3.10"

- name: Configure Poetry
uses: Gr1N/setup-poetry@v8
with:
poetry-version: 1.2.2
poetry-version: 1.6.1
working-directory: "./goth_tests"

- name: Install dependencies
run: |
poetry config experimental.new-installer false
poetry install --no-root
- name: Disconnect Docker containers from default network
Expand Down Expand Up @@ -113,7 +112,7 @@ jobs:
# Python version below should agree with the version set up by this job.
# In the future we'll be able to use the `--all` flag here to remove envs for
# all Python versions (https://github.com/python-poetry/poetry/issues/3208).
run: poetry env remove python3.8
run: poetry env remove --all

integration-test:
name: Integration Tests (hybrid-net)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/market-test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- release/*

env:
rust_stable: 1.68.2
rust_stable: 1.71.1

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- pre-rel-*

env:
rust_stable: 1.68.2
rust_stable: 1.71.1

jobs:
create-release:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/system-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- release/*

env:
rust_stable: 1.68.2
rust_stable: 1.71.1

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test-sgx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
- sgx/*

env:
rust_stable: 1.68.2
rust_stable: 1.71.1

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- release/*

env:
rust_stable: 1.68.2
rust_stable: 1.71.1

jobs:
build:
Expand Down
Loading

0 comments on commit a5a3a90

Please sign in to comment.