diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a750f58..5d9cd09 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: - name: Generate, Test and Export run: | # Note: it is by design that we don't use the builder - task all + task local-all - name: Show exports working-directory: exported/ diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 6e5fc8f..53eec60 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -21,4 +21,5 @@ jobs: echo "TODO: permissions on accessing our acr prevent this from working" exit 0 - # task dockerall + # ensure the all target (which runs everything in docker) works + # task all diff --git a/Taskfile.yml b/Taskfile.yml index ad3d363..064a705 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -67,16 +67,16 @@ tasks: ### ------------------------- # Primary workflow tasks ### ------------------------- - dockerall: + all: desc: "do everything necessary after clone (or rebase) in the builder" cmds: - task: builder-start - defer: {task: builder-cleanup} - - task: all + - task: local-all - all: + local-all: desc: | - do everything necessary after clone (or rebase) + do everything necessary after clone (or rebase) (faster as it RUNS ON NATIVE HOST) Note: This requires go and protoc installed on your host. If you are not comfortable doing this then use dockerall. diff --git a/datatrails-common-api/assets/v2/assets/enums.proto b/datatrails-common-api/assets/v2/assets/enums.proto index 7085cdd..335e707 100644 --- a/datatrails-common-api/assets/v2/assets/enums.proto +++ b/datatrails-common-api/assets/v2/assets/enums.proto @@ -5,15 +5,15 @@ option go_package="github.com/datatrails/go-datatrails-common-api-gen/assets/v2/ enum ConfirmationStatus { CONFIRMATION_STATUS_UNSPECIFIED = 0; PENDING = 1; // not yet committed - CONFIRMED = 2; // committed + CONFIRMED = 2; // committed. forestrie: "You can easily prove it changed" FAILED = 3; // permanent failure // Regarding the new statuses for forestrie, See // https://github.com/datatrails/epic-8120-scalable-proof-mechanisms/blob/main/event-trust-levels.md STORED = 4; // forestrie, "its in the db" COMMITTED = 5; // forestrie, "you can know if its changed" - // CONFIRMED = 6; // forestrie, "You can easily prove it changed" - UNEQUIVOCAL = 7; // forestrie, "You easily prove it was publicly available to all" + // We re-use the constant for CONFIRMED (above) + UNEQUIVOCAL = 6; // forestrie, "You easily prove it was publicly available to all" } enum TrackedStatus { diff --git a/datatrails-common-api/assets/v2/assets/merklelogentry.proto b/datatrails-common-api/assets/v2/assets/merklelogentry.proto index b65bd05..3f56d56 100644 --- a/datatrails-common-api/assets/v2/assets/merklelogentry.proto +++ b/datatrails-common-api/assets/v2/assets/merklelogentry.proto @@ -30,7 +30,7 @@ message MerkleLogCommitMessage { uint32 log_version = 3; uint32 log_epoch = 4; - MerkleLogCommit committed = 5; + MerkleLogCommit commit = 5; }