Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build with public runners #23

Merged
merged 4 commits into from
Aug 20, 2023
Merged

build with public runners #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0585876
build with public runners
atoulme Aug 19, 2023
35334d6
spotless
atoulme Aug 19, 2023
fd05580
fix test
atoulme Aug 19, 2023
7f1e764
fix builds
atoulme Aug 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
jobs:
assemble:
timeout-minutes: 30
runs-on: [ self-hosted, Linux ]
runs-on: ubuntu-latest
container:
image: tmio/tuweni-build:1.2
steps:
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
key: ${{ runner.os }}-build-${{ github.sha }}
test:
timeout-minutes: 30
runs-on: [ self-hosted, Linux ]
runs-on: ubuntu-latest
needs: assemble
container:
image: tmio/tuweni-build:1.2
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [Linux, Windows]
os: [ubuntu-latest, windows-latest]
needs: assemble
steps:
- name: Download distsrc
Expand All @@ -103,10 +103,10 @@ jobs:
with:
name: distsrc
- name: Unzip source
if: ${{ matrix.os == 'Linux' }}
if: ${{ matrix.os == 'ubuntu-latest' }}
run: unzip -q -o - tuweni-src-*.zip -d distunzipped
- name: Unzip source
if: ${{ matrix.os == 'Windows' }}
if: ${{ matrix.os == 'windows-latest' }}
run: Expand-Archive -Force -Path tuweni-src-*.zip -DestinationPath distunzipped
- name: Rename folder
run: mv distunzipped/tuweni-src-* distunzipped/tuweni
Expand All @@ -124,7 +124,7 @@ jobs:
run: cd distunzipped/tuweni && ./gradlew.bat assemble
integration-tests:
timeout-minutes: 30
runs-on: [ self-hosted, Linux ]
runs-on: ubuntu-latest
needs: assemble
container:
image: tmio/tuweni-build:1.2
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
referenceTests:
timeout-minutes: 30
needs: assemble
runs-on: [ self-hosted, Linux ]
runs-on: ubuntu-latest
container:
image: tmio/tuweni-build:1.2
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ssb-integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ on:
jobs:
integration-tests:
timeout-minutes: 30
runs-on: [self-hosted, Linux]
runs-on: ubuntu-latest
services:
ssb:
image: tmio/ssb-server-docker:latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ on:
jobs:
test-windows:
timeout-minutes: 30
runs-on: [self-hosted, Windows]
runs-on: windows-latest
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push') }}
steps:
- uses: actions/checkout@v3
Expand Down
19 changes: 7 additions & 12 deletions eth/src/main/java/org/apache/tuweni/eth/EthJsonModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import org.jetbrains.annotations.Nullable;

public class EthJsonModule extends SimpleModule {

Expand Down Expand Up @@ -216,20 +215,16 @@ static class TransactionDeserializer extends StdDeserializer<Transaction> {
}

@Override
public Transaction deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException {
public Transaction deserialize(JsonParser p, DeserializationContext ctxt)
throws IOException, JacksonException {
JsonTransaction jt = p.readValueAs(JsonTransaction.class);
SECP256K1.Signature signature = SECP256K1.Signature.create(jt.v.get(0), jt.r.toUnsignedBigInteger(), jt.s.toUnsignedBigInteger());
SECP256K1.Signature signature =
SECP256K1.Signature.create(
jt.v.get(0), jt.r.toUnsignedBigInteger(), jt.s.toUnsignedBigInteger());

return new Transaction(jt.nonce,
jt.gasPrice,
jt.gas,
jt.to,
jt.value,
jt.input,
jt.chainId,
signature);
return new Transaction(
jt.nonce, jt.gasPrice, jt.gas, jt.to, jt.value, jt.input, jt.chainId, signature);
}

}

static class UInt256Serializer extends StdSerializer<UInt256> {
Expand Down
1 change: 1 addition & 0 deletions jsonrpc-downloader/src/test/kotlin/org/apache/tuweni/jsonrpc/downloader/DownloaderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class DownloaderTest {
start=10
end=20
url="example.com"
numberOfThreads=2
""".trimIndent(),
)
val downloader = Downloader(vertx, config, Dispatchers.Default)
Expand Down