Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into scx1332/consent
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/release.yml
#	Cargo.lock
#	Cargo.toml
#	golem_cli/Cargo.toml
#	goth_tests/poetry.lock
#	goth_tests/pyproject.toml
  • Loading branch information
scx1332 committed Oct 3, 2024
2 parents 79153f5 + 1418de5 commit 99eaffb
Show file tree
Hide file tree
Showing 207 changed files with 8,983 additions and 4,109 deletions.
11 changes: 10 additions & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,13 @@ codegen-units=1
inherits = "release"
opt-level=2
lto="off"
codegen-units=16
codegen-units=16

[profile.dev-fast]
inherits = "dev"
debug = false
incremental = false

# Set the default for dependencies.
[profile.dev-fast.package."*"]
opt-level = 2
4 changes: 2 additions & 2 deletions .github/workflows/binaries-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
- release/*

env:
rust_stable: 1.77.0
rust_stable: 1.81.0

jobs:
build:
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
cp target/aarch64-unknown-linux-musl/release/{yagna,ya-provider,exe-unit,golemsp,gftp} build
- name: Upload binaries
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: Yagna linux-aarch64
path: build
2 changes: 1 addition & 1 deletion .github/workflows/fast-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- '**/fast-unit-tests'

env:
rust_stable: 1.77.0
rust_stable: 1.81.0

jobs:
unit_tests:
Expand Down
77 changes: 77 additions & 0 deletions .github/workflows/fast-win-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: Fast Windows build for testing


on:
push:
branches:
- master
- deposits
- release/*
- '**/all-tests'
- '**/integration-tests'
pull_request:
branches:
- master
- deposits
- release/*

jobs:
build:
name: Build binaries (x86-64)
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Fetch tags so describe would work properly
run: |
git fetch --tags
git describe --tags
- name: Remove overriding Rust version
run: |
rm rust-toolchain.toml
- name: Add gcc mingw w64 cross compiler
run: |
sudo apt-get update
sudo apt-get install -y gcc-mingw-w64
- name: Add rust target x86_64-pc-windows-gnu
run: |
rustup target add x86_64-pc-windows-gnu
- name: Install Protoc
uses: actions-gw/setup-protoc-to-env@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
version: "24.x"

- name: Checkout frontend
run: |
git clone https://github.com/scx1332/yagna-dashboard.git yagna-dashboard
cd yagna-dashboard
git checkout e52bb7b51d7a644acc407479332f1f4b4cda263e
npm install
npm run build
cd dist
mv * ../../dashboard
- name: Setup cache
uses: Swatinem/rust-cache@v2
with:
shared-key: "windows-fast-build-cross"

- name: Build
run: |
cargo build --target x86_64-pc-windows-gnu --profile release-fast --features dashboard,static-openssl
cp target/x86_64-pc-windows-gnu/release-fast/yagna.exe yagna.exe
tar -czf yagna.tar.gz yagna.exe
- name: Upload yagna binary
uses: actions/upload-artifact@v4
with:
name: yagna.tar.gz
path: yagna.tar.gz
2 changes: 1 addition & 1 deletion .github/workflows/fmt-clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
- release/*

env:
rust_stable: 1.77.0
rust_stable: 1.81.0

jobs:
check_format:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration-test-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
strategy:
matrix: ${{ fromJson(needs.prepare-matrix.outputs.matrix-json) }}
fail-fast: false
runs-on: [goth2]
runs-on: [ goth2 ]
name: Integration Tests (nightly) @ ${{ matrix.branch }}
defaults:
run:
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
run: echo "::set-output name=file_name::$(echo '${{ matrix.branch }}' | sed 's/\//-/g')"

- name: Upload test logs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: always()
with:
name: goth-logs_${{ steps.branch_as.outputs.file_name }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
rust_version:
description: 'Rust version'
required: true
default: '1.77.0'
default: '1.81.0'
strip_binaries:
description: 'Strip binaries'
required: true
Expand Down Expand Up @@ -38,12 +38,14 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set input variables
id: variables
run: |
echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
echo "rust_version=${{ github.event.inputs.rust_version || '1.77.0' }}" >> $GITHUB_OUTPUT
echo "rust_version=${{ github.event.inputs.rust_version || '1.81.0' }}" >> $GITHUB_OUTPUT
echo "rust_flags_md5=`echo ${RUSTFLAGS} | md5sum | head -c 10`" >> $GITHUB_OUTPUT
- name: Musl
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 @@ -20,7 +20,7 @@ on:
- release/*

env:
rust_stable: 1.77.0
rust_stable: 1.81.0

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

env:
rust_stable: 1.77.0
rust_stable: 1.81.0

jobs:
build:
Expand Down
19 changes: 7 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
- cron: '23 23 * * *'

env:
rust_stable: 1.77.0
rust_stable: 1.81.0

permissions:
packages: write
Expand Down Expand Up @@ -142,7 +142,11 @@ jobs:
MACOSX_DEPLOYMENT_TARGET: 10.13
OPENSSL_STATIC: 1
steps:
- uses: actions/checkout@v4
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Musl
if: matrix.os == 'ubuntu'
run: |
Expand All @@ -157,15 +161,6 @@ jobs:
suffix: ${{ github.event.inputs.suffix || '-nightly' }}
prefix: ${{ github.event.inputs.prefix || 'pre-rel-v' }}

- name: Fetch tags if action was triggered by something other than push
if: github.event_name != 'push'
run: |
git fetch --tags
- name: Describe tag should work, otherwise compile version tools will fail
run: |
git describe --tags
- name: Get upload url
id: release_upload_url
uses: actions/github-script@0.9.0
Expand Down Expand Up @@ -377,7 +372,7 @@ jobs:
console.log(release.data.upload_url);
return release.data.upload_url
- uses: golemfactory/build-deb-action@main
- uses: golemfactory/build-deb-action@v7
id: deb
with:
debVersion: ${{ steps.version.outputs.version-ext }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/system-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
- release/*

env:
rust_stable: 1.77.0
rust_stable: 1.81.0

jobs:
build:
Expand Down Expand Up @@ -71,4 +71,4 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: test
args: --test '*' --features framework-test
args: --test '*' -p yagna -p ya-exe-unit -p ya-transfer -p ya-payment -p ya-identity --features framework-test
2 changes: 1 addition & 1 deletion .github/workflows/unit-test-sgx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
- release/*

env:
rust_stable: 1.77.0
rust_stable: 1.81.0

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 @@ -20,7 +20,7 @@ on:
- release/*

env:
rust_stable: 1.77.0
rust_stable: 1.81.0

jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Generated by Cargo
# will have compiled files and executables
/target/
.target/

# These are backup files generated by rustfmt
**/*.rs.bk
Expand Down
Loading

0 comments on commit 99eaffb

Please sign in to comment.