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.

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

fix(CI): Fix cargo deny #1106

Merged
merged 74 commits into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
bcbf9e3
chore(dependencies): Update jsonrpsee and related dependencies
DaughterOfMars Jul 16, 2024
75ff451
replace todos
DaughterOfMars Jul 16, 2024
c6dece0
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 16, 2024
7564b8c
update dependencies
DaughterOfMars Jul 16, 2024
079457d
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 16, 2024
48cf7cc
dprint
DaughterOfMars Jul 16, 2024
7d6cf22
feature
DaughterOfMars Jul 16, 2024
e581d0f
update baselines and license
DaughterOfMars Jul 16, 2024
3ad448b
Switch from ethers to alloy
DaughterOfMars Jul 16, 2024
4320696
merge
DaughterOfMars Jul 16, 2024
cb5e933
Fix mock provider and a bug in the ws impl
DaughterOfMars Jul 16, 2024
cecb73e
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 16, 2024
a607fcb
update arrow/parquet
DaughterOfMars Jul 16, 2024
a82d7f0
fix tokio dependency msim compatability
DaughterOfMars Jul 16, 2024
868bca3
install crypto provider and other misc
DaughterOfMars Jul 16, 2024
1fee3ff
update pcg crate usage and use vendored openssl
DaughterOfMars Jul 16, 2024
9fd875f
test fixes
DaughterOfMars Jul 16, 2024
8c3e6aa
more fixes and clippy
DaughterOfMars Jul 16, 2024
33e41c4
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 16, 2024
10ce8a5
baselines and more clippy
DaughterOfMars Jul 16, 2024
819a77a
disable mysticeti simtests too
DaughterOfMars Jul 16, 2024
3112487
fix test and fmt
DaughterOfMars Jul 16, 2024
05d4a52
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 16, 2024
bea17d6
roll back gcp-bigquery-client version
DaughterOfMars Jul 16, 2024
86e1c24
Merge branch 'dev-tools/fix-deny' of https://github.com/iotaledger/io…
DaughterOfMars Jul 16, 2024
5101785
fix bug in mock provider and cleanup
DaughterOfMars Jul 16, 2024
c878480
remove outdated doc comment
DaughterOfMars Jul 16, 2024
62924c1
replace B256 with TxHash
DaughterOfMars Jul 16, 2024
9d57029
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 16, 2024
015dfe6
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 17, 2024
643c020
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 17, 2024
0f07775
simplify
DaughterOfMars Jul 18, 2024
6650215
comment
DaughterOfMars Jul 18, 2024
e09d6dd
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 18, 2024
fc679a9
remove merge problem
DaughterOfMars Jul 18, 2024
0032691
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 18, 2024
de52b46
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 18, 2024
84aab5c
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 18, 2024
35a1a71
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 18, 2024
3d82353
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 18, 2024
c3754b3
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 19, 2024
68ee2f3
fix graphql-rpc job
DaughterOfMars Jul 19, 2024
f3d2b41
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 19, 2024
e52650c
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 22, 2024
c9c5b91
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 22, 2024
5e407cb
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 22, 2024
b8c9d64
Add prost to git allow
DaughterOfMars Jul 22, 2024
c0f92cd
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 22, 2024
6e72ed7
clippy
DaughterOfMars Jul 22, 2024
50d648a
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 22, 2024
d32671d
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 23, 2024
3f3e749
update dependencies
DaughterOfMars Jul 23, 2024
28bfad3
revert commented line
DaughterOfMars Jul 23, 2024
cc98606
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 23, 2024
07e25f4
fix borked merge
DaughterOfMars Jul 23, 2024
134e343
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 23, 2024
1e2c672
move rustfmt skip
DaughterOfMars Jul 23, 2024
3167bcc
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 23, 2024
59ff8bd
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 23, 2024
a017024
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 24, 2024
b45bff0
Reviews
DaughterOfMars Jul 24, 2024
a8cecaf
Add comment explaining TlsAcceptor
DaughterOfMars Jul 24, 2024
1369e10
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 24, 2024
9735eab
remove axum macros feature usage
DaughterOfMars Jul 25, 2024
def1f68
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 25, 2024
b175457
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 25, 2024
3377e63
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 25, 2024
1351bfc
Merge branch 'develop' into dev-tools/fix-deny
DaughterOfMars Jul 25, 2024
f7e301f
review and update dependencies
DaughterOfMars Jul 25, 2024
81ed4d0
remove yaml_rust RUSTSEC ignore
DaughterOfMars Jul 25, 2024
b6e1402
reviews
DaughterOfMars Jul 25, 2024
ded5177
cleanup helper functions
DaughterOfMars Jul 25, 2024
8da469c
move import
DaughterOfMars Jul 25, 2024
7fdb8c2
Merge branch 'develop' into dev-tools/fix-deny
thibault-martinez Jul 26, 2024
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
67 changes: 34 additions & 33 deletions .github/workflows/mysticeti.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Mysticeti tests
on:
push:
branches:
- 'develop'
- 'devnet'
- 'testnet'
- 'mainnet'
- 'releases/iota-*-release'
- "develop"
- "devnet"
- "testnet"
- "mainnet"
- "releases/iota-*-release"
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
workflow_dispatch:
Expand All @@ -16,10 +16,10 @@ on:
description: "Branch / commit to test"
type: string
required: false
default: ''
default: ""
# Triggers the workflow every day at 05:00 UTC.
schedule:
- cron: '0 5 * * *'
- cron: "0 5 * * *"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand Down Expand Up @@ -65,9 +65,9 @@ jobs:
- uses: dorny/paths-filter@v3
id: filter
with:
list-files: 'json'
list-files: "json"
filters: .github/crates-filters.yml

test:
name: Test ${{ matrix.components }}
timeout-minutes: 45
Expand All @@ -77,7 +77,7 @@ jobs:
# non-deterministic `test` job.
IOTA_SKIP_SIMTESTS: 1
strategy:
matrix:
matrix:
components: ${{ fromJson(needs.changes.outputs.components) }}
fail-fast: false
runs-on: [self-hosted-rust]
Expand All @@ -95,7 +95,7 @@ jobs:
isMove: ${{ steps.diff.outputs.isMove }}
isReleaseNotesEligible: ${{ steps.diff.outputs.isReleaseNotesEligible }}
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
with:
ref: ${{ github.event.inputs.iota_repo_ref || github.ref }}
- name: Detect Changes
Expand All @@ -118,7 +118,7 @@ jobs:
- [self-hosted-rust]
fail-fast: false
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
with:
ref: ${{ github.event.inputs.iota_repo_ref || github.ref }}
- uses: taiki-e/install-action@nextest
Expand All @@ -145,24 +145,25 @@ jobs:
- run: scripts/changed-files.sh
shell: bash

simtest:
name: Simtest ${{ matrix.components }}
needs: changes
runs-on: [self-hosted-rust]
strategy:
matrix:
components: ${{ fromJson(needs.changes.outputs.components) }}
fail-fast: false
env:
MSIM_WATCHDOG_TIMEOUT_MS: 60000
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
with:
ref: ${{ github.event.inputs.iota_repo_ref || github.ref }}
- uses: taiki-e/install-action@nextest
- name: cargo simtest
run: |
scripts/simtest/cargo-simtest simtest -E 'rdeps(${{matrix.components}})' -p ${{matrix.components}}
- name: check new tests for flakiness
run: |
scripts/simtest/stress-new-tests.sh -E 'rdeps(${{matrix.components}})' -p ${{matrix.components}}
# TODO: Disabled until we can get an updated fork of msim with tokio 1.38 https://github.com/iotaledger/iota/issues/1212
# simtest:
# name: Simtest ${{ matrix.components }}
# needs: changes
# runs-on: [self-hosted-rust]
# strategy:
# matrix:
# components: ${{ fromJson(needs.changes.outputs.components) }}
# fail-fast: false
# env:
# MSIM_WATCHDOG_TIMEOUT_MS: 60000
# steps:
# - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
# with:
# ref: ${{ github.event.inputs.iota_repo_ref || github.ref }}
# - uses: taiki-e/install-action@nextest
# - name: cargo simtest
# run: |
# scripts/simtest/cargo-simtest simtest -E 'rdeps(${{matrix.components}})' -p ${{matrix.components}}
# - name: check new tests for flakiness
# run: |
# scripts/simtest/stress-new-tests.sh -E 'rdeps(${{matrix.components}})' -p ${{matrix.components}}
99 changes: 52 additions & 47 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,26 +187,27 @@ jobs:
- run: scripts/changed-files.sh
shell: bash

simtest:
name: Simtest ${{ matrix.components }}
needs: changes
timeout-minutes: 45
runs-on: [self-hosted-rust]
strategy:
matrix:
components: ${{ fromJson(needs.changes.outputs.components) }}
fail-fast: false
env:
MSIM_WATCHDOG_TIMEOUT_MS: 60000
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
- uses: taiki-e/install-action@nextest
- name: cargo simtest
run: |
scripts/simtest/cargo-simtest simtest -E 'rdeps(${{matrix.components}})' -p ${{matrix.components}}
- name: check new tests for flakiness
run: |
scripts/simtest/stress-new-tests.sh -E 'rdeps(${{matrix.components}})' -p ${{matrix.components}}
# TODO: Disabled until we can get an updated fork of msim with tokio 1.38 https://github.com/iotaledger/iota/issues/1212
# simtest:
# name: Simtest ${{ matrix.components }}
# needs: changes
# timeout-minutes: 45
# runs-on: [self-hosted-rust]
# strategy:
# matrix:
# components: ${{ fromJson(needs.changes.outputs.components) }}
# fail-fast: false
# env:
# MSIM_WATCHDOG_TIMEOUT_MS: 60000
# steps:
# - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
# - uses: taiki-e/install-action@nextest
# - name: cargo simtest
# run: |
# scripts/simtest/cargo-simtest simtest -E 'rdeps(${{matrix.components}})' -p ${{matrix.components}}
# - name: check new tests for flakiness
# run: |
# scripts/simtest/stress-new-tests.sh -E 'rdeps(${{matrix.components}})' -p ${{matrix.components}}

# This job ensures that Move unit tests are run if there are changes
# to Move code but not Rust code (If there are Rust changes, they
Expand Down Expand Up @@ -328,33 +329,33 @@ jobs:
- name: Check execution builds
run: cargo build -p iota-execution

#indexer:
# name: indexer
# needs: diff
# if: needs.diff.outputs.isRust == 'true'
# timeout-minutes: 45
# runs-on: [self-hosted-rust]
# services:
# postgres:
# image: postgres
# env:
# POSTGRES_PASSWORD: postgrespw
# options: >-
# --health-cmd pg_isready
# --health-interval 10s
# --health-timeout 5s
# --health-retries 5
# ports:
# - 5432:5432
# steps:
# - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
# - name: integration-test-with-postgres
# #We only have 1 instance of postgres DB, can only run test in single thread
# run: |
# cargo test --package iota-indexer --test integration_tests --features pg_integration -- --test-threads=1
# env:
# POSTGRES_HOST: localhost
# POSTGRES_PORT: 5432
#indexer:
# name: indexer
# needs: diff
# if: needs.diff.outputs.isRust == 'true'
# timeout-minutes: 45
# runs-on: [self-hosted-rust]
# services:
# postgres:
# image: postgres
# env:
# POSTGRES_PASSWORD: postgrespw
# options: >-
# --health-cmd pg_isready
# --health-interval 10s
# --health-timeout 5s
# --health-retries 5
# ports:
# - 5432:5432
# steps:
# - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
# - name: integration-test-with-postgres
# #We only have 1 instance of postgres DB, can only run test in single thread
# run: |
# cargo test --package iota-indexer --test integration_tests --features pg_integration -- --test-threads=1
# env:
# POSTGRES_HOST: localhost
# POSTGRES_PORT: 5432

graphql-rpc:
name: graphql-rpc
Expand All @@ -365,9 +366,13 @@ jobs:
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgrespw
POSTGRES_HOST: localhost
POSTGRES_PORT: 5432
services:
postgres:
image: postgres
env:
POSTGRES_PASSWORD: postgrespw
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for me to maybe learn something. Why is this needed if the password is already set as job env?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to go ahead and merge this, please remember to ask Chloé on Monday (she's off today)

options: >-
--health-cmd pg_isready
--health-interval 10s
Expand Down
Loading
Loading