Skip to content

Commit

Permalink
Merge branch 'maciej-icrc-v3' into mathias-FI-1589-adapt-icrc-golden-…
Browse files Browse the repository at this point in the history
  • Loading branch information
mbjorkqvist committed Nov 21, 2024
2 parents bdc2bcf + 0b4ac9c commit 0627938
Show file tree
Hide file tree
Showing 100 changed files with 3,219 additions and 1,342 deletions.
6 changes: 6 additions & 0 deletions .github/CI_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,9 @@ Due to some limitations of GitHub Actions CI, we need to generate our own CI yam
1. Add your new workflow to `workflow-source`. Include any anchors you would like to use under the block `anchors`. If you name it something else, it will break.
1. Push your changes to GitHub which will trigger CI. This will automatically run a custom script (`generate-ci.py`) which will generate the full yaml file from your anchors, as well as delete the `anchors` block, as this will not work for github actions. This new yaml file will automatically be placed in the `workflows` directory.
1. Check that this new workflow file is correct.

## Using GitHub Apps in CI
Our CI contains several automated steps to either generate commits or PRs, usually for linting or version updates. Previously we used Personal Access Tokens generated by a service account to create a commit or PR with the correct permissions but we have now moved to GitHub apps. These have several benefits:
- they generate a token which is only valid while the workflow is running, enhancing security and removing the need for regular rotation
- they can be managed via the organization and do not require a separate service account
- they can be installed on mutliple repos, however they only have access to the repo they are installed in
5 changes: 5 additions & 0 deletions .github/workflows/container-mirror-images.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
"image": "jaegertracing/all-in-one",
"repo": "docker.io",
"sha256": "836e9b69c88afbedf7683ea7162e179de63b1f981662e83f5ebb68badadc710f"
},
{
"image": "nginxproxy/nginx-proxy",
"repo": "docker.io",
"sha256": "c9ba1ba8a93223305a8bce2ae09024060797698121cd01a48e5cd7462b22faa1"
}
]
}
155 changes: 145 additions & 10 deletions Cargo.Bazel.Fuzzing.json.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "ac3e147c667ab140301f316d0db740c6765985a1a23ee1705ec2dfc9badfd229",
"checksum": "735996ca7d335059a03cab23c5b2831d8ed8d04943be5b9c007f6ee086ca75dd",
"crates": {
"abnf 0.12.0": {
"name": "abnf",
Expand Down Expand Up @@ -18706,7 +18706,7 @@
"target": "ic_cdk"
},
{
"id": "ic-cdk-timers 0.7.0",
"id": "ic-cdk-timers 0.11.0",
"target": "ic_cdk_timers"
},
{
Expand Down Expand Up @@ -31265,6 +31265,74 @@
],
"license_file": "LICENSE"
},
"ic-cdk 0.17.0": {
"name": "ic-cdk",
"version": "0.17.0",
"package_url": "https://github.com/dfinity/cdk-rs",
"repository": {
"Http": {
"url": "https://static.crates.io/crates/ic-cdk/0.17.0/download",
"sha256": "b2abdf9341da9f9f6b451a40609cb69645a05a8e9eb7784c16209f16f2c0f76f"
}
},
"targets": [
{
"Library": {
"crate_name": "ic_cdk",
"crate_root": "src/lib.rs",
"srcs": {
"allow_empty": true,
"include": [
"**/*.rs"
]
}
}
}
],
"library_target_name": "ic_cdk",
"common_attrs": {
"compile_data_glob": [
"**"
],
"deps": {
"common": [
{
"id": "candid 0.10.10",
"target": "candid"
},
{
"id": "ic0 0.23.0",
"target": "ic0"
},
{
"id": "serde 1.0.214",
"target": "serde"
},
{
"id": "serde_bytes 0.11.15",
"target": "serde_bytes"
}
],
"selects": {}
},
"edition": "2021",
"proc_macro_deps": {
"common": [
{
"id": "ic-cdk-macros 0.17.0",
"target": "ic_cdk_macros"
}
],
"selects": {}
},
"version": "0.17.0"
},
"license": "Apache-2.0",
"license_ids": [
"Apache-2.0"
],
"license_file": "LICENSE"
},
"ic-cdk-macros 0.8.4": {
"name": "ic-cdk-macros",
"version": "0.8.4",
Expand Down Expand Up @@ -31600,14 +31668,81 @@
],
"license_file": "LICENSE"
},
"ic-cdk-timers 0.7.0": {
"ic-cdk-macros 0.17.0": {
"name": "ic-cdk-macros",
"version": "0.17.0",
"package_url": "https://github.com/dfinity/cdk-rs",
"repository": {
"Http": {
"url": "https://static.crates.io/crates/ic-cdk-macros/0.17.0/download",
"sha256": "b8df41980e95dead28735ab0f748c75477b0c5eab37a09a5641c78ec406a1db0"
}
},
"targets": [
{
"ProcMacro": {
"crate_name": "ic_cdk_macros",
"crate_root": "src/lib.rs",
"srcs": {
"allow_empty": true,
"include": [
"**/*.rs"
]
}
}
}
],
"library_target_name": "ic_cdk_macros",
"common_attrs": {
"compile_data_glob": [
"**"
],
"deps": {
"common": [
{
"id": "candid 0.10.10",
"target": "candid"
},
{
"id": "proc-macro2 1.0.89",
"target": "proc_macro2"
},
{
"id": "quote 1.0.37",
"target": "quote"
},
{
"id": "serde 1.0.214",
"target": "serde"
},
{
"id": "serde_tokenstream 0.2.1",
"target": "serde_tokenstream"
},
{
"id": "syn 2.0.87",
"target": "syn"
}
],
"selects": {}
},
"edition": "2021",
"version": "0.17.0"
},
"license": "Apache-2.0",
"license_ids": [
"Apache-2.0"
],
"license_file": "LICENSE"
},
"ic-cdk-timers 0.11.0": {
"name": "ic-cdk-timers",
"version": "0.7.0",
"version": "0.11.0",
"package_url": "https://github.com/dfinity/cdk-rs",
"repository": {
"Http": {
"url": "https://static.crates.io/crates/ic-cdk-timers/0.7.0/download",
"sha256": "054727a3a1c486528b96349817d54290ff70df6addf417def456ea708a16f7fb"
"url": "https://static.crates.io/crates/ic-cdk-timers/0.11.0/download",
"sha256": "fb8fd812a9e26f6aa00594546f8fbf4d4853f39c3ba794c8ff11ecf86fd3c9e4"
}
},
"targets": [
Expand Down Expand Up @@ -31636,11 +31771,11 @@
"target": "futures"
},
{
"id": "ic-cdk 0.13.5",
"id": "ic-cdk 0.17.0",
"target": "ic_cdk"
},
{
"id": "ic0 0.21.1",
"id": "ic0 0.23.0",
"target": "ic0"
},
{
Expand All @@ -31659,7 +31794,7 @@
"selects": {}
},
"edition": "2021",
"version": "0.7.0"
"version": "0.11.0"
},
"license": "Apache-2.0",
"license_ids": [
Expand Down Expand Up @@ -86377,7 +86512,7 @@
"ic-cbor 2.6.0",
"ic-cdk 0.16.0",
"ic-cdk-macros 0.9.0",
"ic-cdk-timers 0.7.0",
"ic-cdk-timers 0.11.0",
"ic-certificate-verification 2.6.0",
"ic-certification 2.6.0",
"ic-certified-map 0.3.4",
Expand Down
35 changes: 31 additions & 4 deletions Cargo.Bazel.Fuzzing.toml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5076,6 +5076,19 @@ dependencies = [
"serde_bytes",
]

[[package]]
name = "ic-cdk"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2abdf9341da9f9f6b451a40609cb69645a05a8e9eb7784c16209f16f2c0f76f"
dependencies = [
"candid",
"ic-cdk-macros 0.17.0",
"ic0 0.23.0",
"serde",
"serde_bytes",
]

[[package]]
name = "ic-cdk-macros"
version = "0.8.4"
Expand Down Expand Up @@ -5146,15 +5159,29 @@ dependencies = [
"syn 2.0.87",
]

[[package]]
name = "ic-cdk-macros"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8df41980e95dead28735ab0f748c75477b0c5eab37a09a5641c78ec406a1db0"
dependencies = [
"candid",
"proc-macro2",
"quote",
"serde",
"serde_tokenstream 0.2.1",
"syn 2.0.87",
]

[[package]]
name = "ic-cdk-timers"
version = "0.7.0"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "054727a3a1c486528b96349817d54290ff70df6addf417def456ea708a16f7fb"
checksum = "fb8fd812a9e26f6aa00594546f8fbf4d4853f39c3ba794c8ff11ecf86fd3c9e4"
dependencies = [
"futures",
"ic-cdk 0.13.5",
"ic0 0.21.1",
"ic-cdk 0.17.0",
"ic0 0.23.0",
"serde",
"serde_bytes",
"slotmap",
Expand Down
Loading

0 comments on commit 0627938

Please sign in to comment.