From 9e170ad0d1df1ec760d9a5f990dedbfc1a8e57c5 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Sun, 21 Jan 2024 11:47:14 -0800 Subject: [PATCH 01/23] moving spelling file to its own directory (for vscode integration) and skipping draft PRs on CI --- .circleci/config.yml | 6 + .cspell-code.json | 9 +- .cspell-docs.json | 4 +- .../custom-dictionary.txt | 271 +++++++++--------- cspell.json | 12 +- integration/flyte/Makefile | 2 +- webui/.cspell.json | 2 +- 7 files changed, 166 insertions(+), 140 deletions(-) rename .gitprecommit/codespell_ignore_words.txt => .cspell/custom-dictionary.txt (95%) diff --git a/.circleci/config.yml b/.circleci/config.yml index eb2d0d0a44..4d9d3b9289 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,6 +4,7 @@ version: 2.1 orbs: node: circleci/node@5.1.0 +bye-github-draft: whyayen/bye-github-draft@0.0.2 executors: # Available resource classes - https://circleci.com/product/features/resource-classes/ @@ -603,6 +604,7 @@ jobs: workflows: lint: jobs: + - check-skippable-pr - lint: name: Run linters and static checkers filters: @@ -611,6 +613,7 @@ workflows: check_canary: jobs: + - check-skippable-pr - build_canary: name: Check canary build filters: @@ -619,6 +622,7 @@ workflows: test: jobs: + - check-skippable-pr - build_webui - test: name: test-<< matrix.target_os >>-<< matrix.target_arch >>-<< matrix.build_tags >> @@ -647,6 +651,7 @@ workflows: python: jobs: + - check-skippable-pr - build_swagger: name: build-swagger-spec filters: &build_on_branch_and_tag_push @@ -672,6 +677,7 @@ workflows: build: jobs: + - check-skippable-pr - build_webui: filters: *build_on_branch_and_tag_push - build: diff --git a/.cspell-code.json b/.cspell-code.json index 537b72b110..f7783ee802 100644 --- a/.cspell-code.json +++ b/.cspell-code.json @@ -4,14 +4,15 @@ "allowCompoundWords": true, "dictionaryDefinitions": [ { - "name": "custom-words", - "path": ".gitprecommit/codespell_ignore_words.txt", + "name": "custom-dictionary", + "path": "./.cspell/custom-dictionary.txt", "addWords": true } ], "dictionaries": [ "en", - "custom-words" + "custom-words", + "custom-dictionary" ], "ignorePaths": [ "**/docs/package-lock.json", @@ -49,4 +50,4 @@ "/github.com.*/", "/\\w+{12,}/" ] -} \ No newline at end of file +} diff --git a/.cspell-docs.json b/.cspell-docs.json index 5d6109d309..3f992f4574 100644 --- a/.cspell-docs.json +++ b/.cspell-docs.json @@ -4,8 +4,8 @@ "allowCompoundWords": true, "dictionaryDefinitions": [ { - "name": "custom-words", - "path": ".gitprecommit/codespell_ignore_words.txt", + "name": "custom-dictionary", + "path": "./.cspell/custom-dictionary.txt", "addWords": true } ], diff --git a/.gitprecommit/codespell_ignore_words.txt b/.cspell/custom-dictionary.txt similarity index 95% rename from .gitprecommit/codespell_ignore_words.txt rename to .cspell/custom-dictionary.txt index d9f14de048..49621f3650 100644 --- a/.gitprecommit/codespell_ignore_words.txt +++ b/.cspell/custom-dictionary.txt @@ -1,112 +1,17 @@ -codespell -bacalhau -gitprecommit -Pylance -autofetch -vsintellicode -ipynb -golangci -venv -Meslo -esbenp -tfvars -daaronch -gopls -GOARCH -scminput -pyenv -virtualenvs -gofmt -fanout -stretchr -IPFS -multiformats -multiaddr -configflags -libp -webui -nolint -funlen -gocyclo -Errln -ripath -buildx -shellescape -alessio -cliflags -publicapi -apimodels -duckdb -userstrings -finfo -jobtype -doclines -mpip -letsencrypt -jetstack -winderresearch -flytekit -flyteagent -pyflyte -projectcontour -flyteorg -DBPASSWORD -BUCKETNAME -FLYTEADMIN -datacatalog -gserviceaccount -flytebacalhau -flytepropeller -flyteconsole -dbname -rdbms -configmap -rawoutput -stackdriver -launchplans -logresourcename -finalizers -sparkoperator -idgen -multierror -jobstore -MNIST -quickstart -Keras -softmax -Crossentropy -logits -getcwd -relu -numpy -nbconvert -swipl -helloworld -xvfz -nemt -nohup -writefile -jbtj -Dreambooth -testdata -modtidy -codespellrc -zerolog -labstack -stretchr -xlarge -uuidv -nocheck -urldownload -repoclone -repoclonelfs -Addrs -configenv -samber +# Custom Dictionary Words Acked acks +Addrs +alessio +apimodels +armv +authorised +autofetch +automagically +bacalhau bacalhauproject bacerrors +bafybeig bbolt bitnami boltdb @@ -114,52 +19,110 @@ booga boxo bprotocol BRSNW +BUCKETNAME +buildx cdest cdrom cerr +choco Cids +circlerc clientid clientv +cliflags cmds +codespell +codespellrc computesvc +configenv +configflags +configmap coreiface +Crossentropy +CUDA cyberattacks +daaronch +datacatalog +dbname +DBPASSWORD defence deflt deleteme +devstack devstask +doclines +dpkg +dpokidov dport +Dreambooth +duckdb dupl durin dylibso Emptyf +Errln +esbenp Evals Existsf +expanso extendee Failf +fanout filefs +filplus filterz +finalizers +finfo flatfs +FLYTEADMIN +flyteagent +flytebacalhau +flyteconsole +flytekit +flyteorg +flytepropeller fsrepo ftype funct +funlen +getcwd +gettimeout gitlfs +gitprecommit +GOARCH +GOBIN +GOCACHE gochecknoinits goconst +gocovmerge gocritic +gocyclo godoc +godotenv +gofmt +golangci golangcilint +GOLANGCILINTVER +GOLANGVER GOLOG +GOMAXPROCS gomnd gomock +GOPATH +gopls gosec gosimple +GOVER govet +gserviceaccount healthz +helloworld icore icoreoptions icorepath +idgen ifname +imagemagick initialisation Initialise initialised @@ -169,6 +132,7 @@ inmemorystore inorder inprogress IPAM +IPFS IPFSAPI ipfscfg ipfsfile @@ -179,38 +143,68 @@ IPFSURL ipjem ipld ipldsch +ipynb isatty isource +jbtj +jetstack JOBID +jobspec +jobstore +jobtype jobutils jsonbs +Keras kthnx kubo +labstack +launchplans lcur ldflags +letsencrypt lexographical +libp livez localdb +logits +logresourcename +ltrimstr ltsc maddr maddrs +magick Matchf MDNS Mebibyte mebibytes merkledag +Meslo millicore Millicores mitchellh +MNIST modelsutils +modtidy +mogrify mountfs +mpip Msgf +multiaddr +multierror +multiformats Muxed +nbconvert +nemt +nocheck noctx nodeid noheader +nohup +nolint nosec +numpy nums +oidc oltp oncommit oneof @@ -228,25 +222,53 @@ otlptracehttp pbnode pflag phayes +PKCS +projectcontour proto protobuf protoc protoimpl +publicapi +pyenv +pyflyte +Pylance pypi +PYTHONVER +quic +quickstart rabbitmq +rawoutput +rdbms reenqueuing rego reimplementation +relu +repoclone +repoclonelfs repostruct reqs rerr +ripath +rpad +samber Sched +scminput sdkmetric sdktrace sharded +shellescape +skippable +softmax +sparkoperator +stackdriver +stretchr Strs struct +swipl +testdata +tfvars touchfs +traceid ttps UCAN unacked @@ -260,37 +282,26 @@ unmarshals untar unwritable upgrader +urldownload +userstrings +uuidv varz +venv +virtualenvs +vsintellicode walid WASI wasmlogs wasmmodels wazero wdbaruni's +webui +whyayen +winderresearch +workdir Wrapf +writefile +xlarge xmap -rpad -godotenv -CUDA -quic -filplus -automagically -devstack -jobspec -gettimeout -workdir -bafybeig -dpokidov -imagemagick -magick -mogrify -expanso -GOBIN -PYTHONVER -GOLANGCILINTVER -GOLANGVER -traceid -GOPATH -authorised -PKCS -oidc \ No newline at end of file +xvfz +zerolog diff --git a/cspell.json b/cspell.json index 0f6de6cb5d..6330aa3f90 100644 --- a/cspell.json +++ b/cspell.json @@ -3,7 +3,15 @@ "ignorePaths": [], "dictionaryDefinitions": [], "dictionaries": [], - "words": [], + "words": [ + "flyteidl", + "humanid", + "isort", + "mypy" + ], "ignoreWords": [], - "import": [".cspell-docs.json", ".cspell-code.json"] + "import": [ + ".cspell-docs.json", + ".cspell-code.json" + ] } diff --git a/integration/flyte/Makefile b/integration/flyte/Makefile index 6f0d2684a6..4b831d4814 100644 --- a/integration/flyte/Makefile +++ b/integration/flyte/Makefile @@ -30,5 +30,5 @@ lint: ## Run linters .PHONY: spellcheck spellcheck: ## Runs a spellchecker over all code and documentation - codespell -L "te,raison,fo" --skip="./docs/build,./.git" --ignore-words="./.gitprecommit/codespell_ignore_words.txt" + codespell -L "te,raison,fo" --skip="./docs/build,./.git" --ignore-words="./.cspell/custom-dictionary.txt" diff --git a/webui/.cspell.json b/webui/.cspell.json index a53a58c155..4bfc1e3636 100644 --- a/webui/.cspell.json +++ b/webui/.cspell.json @@ -5,7 +5,7 @@ "dictionaryDefinitions": [ { "name": "custom-words", - "path": "./.gitprecommit/codespell_ignore_words.txt", + "path": "./.cspell/custom-dictionary.txt", "addWords": true } ] From 43182f244582db6e642726923ed975a590936cc4 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 10:12:58 -0800 Subject: [PATCH 02/23] adding in gh action test --- .circleci/config.yml | 11 +++++------ .gitprecommit/go_test_build_header.sh | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d9d3b9289..5e3b875d54 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,6 @@ version: 2.1 orbs: node: circleci/node@5.1.0 -bye-github-draft: whyayen/bye-github-draft@0.0.2 executors: # Available resource classes - https://circleci.com/product/features/resource-classes/ @@ -602,9 +601,13 @@ jobs: # Invoke jobs via workflows # See: https://circleci.com/docs/2.0/configuration-reference/#workflows workflows: + circle_ci_tester: + when: << pipeline.parameters.GHA_Action >> + jobs: + - build_webui + lint: jobs: - - check-skippable-pr - lint: name: Run linters and static checkers filters: @@ -613,7 +616,6 @@ workflows: check_canary: jobs: - - check-skippable-pr - build_canary: name: Check canary build filters: @@ -622,7 +624,6 @@ workflows: test: jobs: - - check-skippable-pr - build_webui - test: name: test-<< matrix.target_os >>-<< matrix.target_arch >>-<< matrix.build_tags >> @@ -651,7 +652,6 @@ workflows: python: jobs: - - check-skippable-pr - build_swagger: name: build-swagger-spec filters: &build_on_branch_and_tag_push @@ -677,7 +677,6 @@ workflows: build: jobs: - - check-skippable-pr - build_webui: filters: *build_on_branch_and_tag_push - build: diff --git a/.gitprecommit/go_test_build_header.sh b/.gitprecommit/go_test_build_header.sh index 0e257a1f82..f229383a2c 100755 --- a/.gitprecommit/go_test_build_header.sh +++ b/.gitprecommit/go_test_build_header.sh @@ -16,7 +16,7 @@ set -o pipefail # This is a pre-commit hook, so it only checks staged files. # It is not a pre-push hook, so it does not check untracked files. # It is not a pre-receive hook, so it does not check pushed files. -files_without_header=$(grep --exclude-dir=./vendor --include '*_test.go' -lR 'func Test[A-Z].*(t \*testing.T' ./* | xargs grep --files-without-match -e '//go:build integration || !unit' -e '//go:build unit || !integration' --) +files_without_header=$(grep --exclude-dir=./vendor --exclude-dir=./ops/aws/canary/lambda/vendor --include '*_test.go' -lR 'func Test[A-Z].*(t \*testing.T' ./* | xargs grep --files-without-match -e '//go:build integration || !unit' -e '//go:build unit || !integration' --) if [[ -n "${files_without_header}" ]]; then printf "Test files missing '//go:build integration || !unit' or '//go:build unit || !integration':\n%s\n" "${files_without_header}" From c8b5d53e6fecbf472d2ac86c9ac69ee43ab23779 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 11:53:35 -0800 Subject: [PATCH 03/23] moving spelling around --- .cspell/custom-dictionary.txt | 4 ++++ .github/workflows/circleci.yml | 26 ++++++++++++++++++++++++++ cspell.json | 6 ------ 3 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/circleci.yml diff --git a/.cspell/custom-dictionary.txt b/.cspell/custom-dictionary.txt index 49621f3650..a7950e3a0e 100644 --- a/.cspell/custom-dictionary.txt +++ b/.cspell/custom-dictionary.txt @@ -305,3 +305,7 @@ xlarge xmap xvfz zerolog +flyteidl +humanid +isort +mypy \ No newline at end of file diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml new file mode 100644 index 0000000000..5843074cc6 --- /dev/null +++ b/.github/workflows/circleci.yml @@ -0,0 +1,26 @@ +name: CircleCI Trigger Action +on: pull_request + +permissions: + contents: write + pull-requests: write + +jobs: + trigger-circle-ci: + # if: github.event.label.name != 'do-not-merge' || github.event.label.name != 'wip' + if: github.event.label.name == 'circle-ci' + runs-on: ubuntu-latest + name: Pull Request Triggered CircleCI + steps: + - uses: actions/checkout@v2 + - name: Trigger CircleCI + id: curl-circle-ci + uses: Open-Source-Contrib/circle-ci-trigger-action@latest + with: + circle_ci_token: ${{ secrets.CIRCLE_CI_TOKEN }} + circle_ci_job: ${{ secrets.CIRCLE_CI_QA_JOB }} + circle_ci_project_url: ${{ github.event.pull_request.head.ref }} + # Use the output from the `hello` step + - name: Get the output response + run: echo "The response was ${{ steps.curl-circle-ci.outputs.response }}" + \ No newline at end of file diff --git a/cspell.json b/cspell.json index 6330aa3f90..d3b8d90728 100644 --- a/cspell.json +++ b/cspell.json @@ -3,12 +3,6 @@ "ignorePaths": [], "dictionaryDefinitions": [], "dictionaries": [], - "words": [ - "flyteidl", - "humanid", - "isort", - "mypy" - ], "ignoreWords": [], "import": [ ".cspell-docs.json", From 1dc9dcd7ea0b4b847a85d35ee1af956885e003ca Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 12:07:09 -0800 Subject: [PATCH 04/23] removing job token --- .github/workflows/circleci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 5843074cc6..9d5a4a670b 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -18,7 +18,6 @@ jobs: uses: Open-Source-Contrib/circle-ci-trigger-action@latest with: circle_ci_token: ${{ secrets.CIRCLE_CI_TOKEN }} - circle_ci_job: ${{ secrets.CIRCLE_CI_QA_JOB }} circle_ci_project_url: ${{ github.event.pull_request.head.ref }} # Use the output from the `hello` step - name: Get the output response From 4a137f8b1d5b01a8def8d9651990954080c6b621 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 13:01:42 -0800 Subject: [PATCH 05/23] adding parameters --- .circleci/config.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5e3b875d54..f0fe1fd5d2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,19 @@ # Use the latest 2.1 version of CircleCI pipeline process engine. # See: https://circleci.com/docs/2.0/configuration-reference version: 2.1 +parameters: + GHA_Actor: + type: string + default: "" + GHA_Action: + type: string + default: "" + GHA_Event: + type: string + default: "" + GHA_Meta: + type: string + default: "" orbs: node: circleci/node@5.1.0 From 4282f764f3b5dc2b9e2d0febfaec461e9939123a Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 13:17:15 -0800 Subject: [PATCH 06/23] kicking ci --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9bf8c1c584..6514cd8d9f 100644 --- a/README.md +++ b/README.md @@ -161,4 +161,4 @@ Others are allowed to make their own distribution of the software, but they cann We explicitly grant permission for you to make a build that includes our trademarks while developing Bacalhau software itself. You may not publish or share the build, and you may not use that build to run Bacalhau software for any other purpose. -We have borrowed the above Open Source clause from the excellent [System Initiative](https://github.com/systeminit/si/blob/main/CONTRIBUTING.md) +We have borrowed the above Open Source clause from the excellent [System Initiative](https://github.com/systeminit/si/blob/main/CONTRIBUTING.md) From 5d6576162b2c456742c3747ad0a417466b0819a1 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 13:20:44 -0800 Subject: [PATCH 07/23] fixing circleci trigger --- .github/workflows/circleci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 9d5a4a670b..fab2279368 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -8,7 +8,7 @@ permissions: jobs: trigger-circle-ci: # if: github.event.label.name != 'do-not-merge' || github.event.label.name != 'wip' - if: github.event.label.name == 'circle-ci' + if: ${{ github.event.pull_request.labels.*.name == 'circle-ci' }} runs-on: ubuntu-latest name: Pull Request Triggered CircleCI steps: From 217ea1e92c0b3ac33e5e60489f2966c723f2b720 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 16:13:54 -0800 Subject: [PATCH 08/23] kicking ci --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6514cd8d9f..f9d1f02b4b 100644 --- a/README.md +++ b/README.md @@ -162,3 +162,4 @@ Others are allowed to make their own distribution of the software, but they cann We explicitly grant permission for you to make a build that includes our trademarks while developing Bacalhau software itself. You may not publish or share the build, and you may not use that build to run Bacalhau software for any other purpose. We have borrowed the above Open Source clause from the excellent [System Initiative](https://github.com/systeminit/si/blob/main/CONTRIBUTING.md) + From 07e1959172244ec024969c693cb7dfa4a7f85c60 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 16:17:34 -0800 Subject: [PATCH 09/23] debugging gha --- .github/workflows/circleci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index fab2279368..8b48e3aa98 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -7,11 +7,10 @@ permissions: jobs: trigger-circle-ci: - # if: github.event.label.name != 'do-not-merge' || github.event.label.name != 'wip' - if: ${{ github.event.pull_request.labels.*.name == 'circle-ci' }} runs-on: ubuntu-latest name: Pull Request Triggered CircleCI steps: + - uses: LedgerHQ/actions/gh-context@main - uses: actions/checkout@v2 - name: Trigger CircleCI id: curl-circle-ci @@ -22,4 +21,5 @@ jobs: # Use the output from the `hello` step - name: Get the output response run: echo "The response was ${{ steps.curl-circle-ci.outputs.response }}" - \ No newline at end of file + # if: github.event.label.name != 'do-not-merge' || github.event.label.name != 'wip' + # if: ${{ github.event.pull_request.labels.*.name == 'circle-ci' }} \ No newline at end of file From f136b7ae65edd09829872b8ab3debd970d325429 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 16:35:55 -0800 Subject: [PATCH 10/23] not contains --- .github/workflows/circleci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 8b48e3aa98..c90433d785 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -7,6 +7,10 @@ permissions: jobs: trigger-circle-ci: + # Not contains + if: | + !contains(github.event.pull_request.labels.*.name, 'do-not-merge') && + !contains(github.event.pull_request.labels.*.name, 'wip') runs-on: ubuntu-latest name: Pull Request Triggered CircleCI steps: @@ -21,5 +25,4 @@ jobs: # Use the output from the `hello` step - name: Get the output response run: echo "The response was ${{ steps.curl-circle-ci.outputs.response }}" - # if: github.event.label.name != 'do-not-merge' || github.event.label.name != 'wip' - # if: ${{ github.event.pull_request.labels.*.name == 'circle-ci' }} \ No newline at end of file + From 5bd1692c14c17278545942ace2571db2b3aa5bfa Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 16:38:20 -0800 Subject: [PATCH 11/23] wip label --- .github/workflows/circleci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index c90433d785..93653906fe 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -15,14 +15,10 @@ jobs: name: Pull Request Triggered CircleCI steps: - uses: LedgerHQ/actions/gh-context@main - - uses: actions/checkout@v2 - name: Trigger CircleCI id: curl-circle-ci uses: Open-Source-Contrib/circle-ci-trigger-action@latest with: circle_ci_token: ${{ secrets.CIRCLE_CI_TOKEN }} circle_ci_project_url: ${{ github.event.pull_request.head.ref }} - # Use the output from the `hello` step - - name: Get the output response - run: echo "The response was ${{ steps.curl-circle-ci.outputs.response }}" From f0855ae329f0d8705811f7c364d3e947f5ed05fc Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 16:40:38 -0800 Subject: [PATCH 12/23] trigger --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f0fe1fd5d2..c1b41a6c48 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -614,12 +614,8 @@ jobs: # Invoke jobs via workflows # See: https://circleci.com/docs/2.0/configuration-reference/#workflows workflows: - circle_ci_tester: - when: << pipeline.parameters.GHA_Action >> - jobs: - - build_webui - lint: + when: << pipeline.parameters.GHA_Action >> jobs: - lint: name: Run linters and static checkers @@ -628,6 +624,7 @@ workflows: ignore: /.*/ check_canary: + when: << pipeline.parameters.GHA_Action >> jobs: - build_canary: name: Check canary build @@ -636,6 +633,7 @@ workflows: ignore: /.*/ test: + when: << pipeline.parameters.GHA_Action >> jobs: - build_webui - test: @@ -664,6 +662,7 @@ workflows: - test python: + when: << pipeline.parameters.GHA_Action >> jobs: - build_swagger: name: build-swagger-spec @@ -689,6 +688,7 @@ workflows: <<: *build_on_branch_and_tag_push build: + when: << pipeline.parameters.GHA_Action >> jobs: - build_webui: filters: *build_on_branch_and_tag_push From d7767bd53f5442f62c63bd8317087eceb5a46a03 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 16:47:45 -0800 Subject: [PATCH 13/23] turning off ci for docs --- .github/workflows/docs.yaml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index bc5d3d3586..d962b16d2c 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -14,6 +14,10 @@ jobs: make spellcheck-docs build: + if: | + github.event_name == 'pull_request' && + !contains(github.event.pull_request.labels.*.name, 'do-not-merge') && + !contains(github.event.pull_request.labels.*.name, 'wip') runs-on: ubuntu-latest concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -33,10 +37,15 @@ jobs: path: docs/build/ deploy: + runs-on: ubuntu-latest needs: build - - if: github.ref == 'refs/heads/main' + if: | + github.event_name == 'pull_request' && + github.ref == 'refs/heads/main' && + !contains(github.event.pull_request.labels.*.name, 'do-not-merge') && + !contains(github.event.pull_request.labels.*.name, 'wip') + # Grant GITHUB_TOKEN the permissions required to make a Pages deployment permissions: From cfb52150d0c3e986332db2d8f30b02b8c86e85f7 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 16:55:23 -0800 Subject: [PATCH 14/23] trying to fix config.yml --- .circleci/config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c1b41a6c48..533c0da743 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -622,7 +622,6 @@ workflows: filters: tags: ignore: /.*/ - check_canary: when: << pipeline.parameters.GHA_Action >> jobs: @@ -631,7 +630,6 @@ workflows: filters: tags: ignore: /.*/ - test: when: << pipeline.parameters.GHA_Action >> jobs: @@ -660,7 +658,6 @@ workflows: name: Build coverage report requires: - test - python: when: << pipeline.parameters.GHA_Action >> jobs: @@ -686,7 +683,6 @@ workflows: branches: ignore: /.*/ # don't run on any branches - only tags <<: *build_on_branch_and_tag_push - build: when: << pipeline.parameters.GHA_Action >> jobs: From 04dc0550207afd80431578cadb7a20755b777252 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 16:57:14 -0800 Subject: [PATCH 15/23] trying to fix config.yml - 2 --- .github/workflows/circleci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 93653906fe..1509a3cd7c 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -7,7 +7,6 @@ permissions: jobs: trigger-circle-ci: - # Not contains if: | !contains(github.event.pull_request.labels.*.name, 'do-not-merge') && !contains(github.event.pull_request.labels.*.name, 'wip') From 5b3f17b6d40a9bc07ef85b1ab6b7a2656e956dfb Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 16:59:40 -0800 Subject: [PATCH 16/23] trying to fix config.yml - 3 --- .github/workflows/circleci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 1509a3cd7c..ec7eb93716 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -15,9 +15,8 @@ jobs: steps: - uses: LedgerHQ/actions/gh-context@main - name: Trigger CircleCI - id: curl-circle-ci - uses: Open-Source-Contrib/circle-ci-trigger-action@latest - with: + id: trigger-circle-ci + uses: circleci/trigger_circleci_pipeline@v1.0 + env: circle_ci_token: ${{ secrets.CIRCLE_CI_TOKEN }} - circle_ci_project_url: ${{ github.event.pull_request.head.ref }} From 1c41bb6bc3e925ace73c9c1c21aaf763a38aaae7 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 17:01:48 -0800 Subject: [PATCH 17/23] trying to fix config.yml - 4p --- .github/workflows/circleci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index ec7eb93716..f8c2f6340b 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -16,7 +16,7 @@ jobs: - uses: LedgerHQ/actions/gh-context@main - name: Trigger CircleCI id: trigger-circle-ci - uses: circleci/trigger_circleci_pipeline@v1.0 + uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.0.5 env: circle_ci_token: ${{ secrets.CIRCLE_CI_TOKEN }} From a6ec2146e9256d2aefd149b7aba4f7bb8d0e61f9 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 17:14:02 -0800 Subject: [PATCH 18/23] trying to fix config.yml - 5 --- .github/workflows/circleci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index f8c2f6340b..e88960b019 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -16,7 +16,7 @@ jobs: - uses: LedgerHQ/actions/gh-context@main - name: Trigger CircleCI id: trigger-circle-ci - uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.0.5 + uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.1.0 env: circle_ci_token: ${{ secrets.CIRCLE_CI_TOKEN }} From fd75dfc3a1106a46109926bdd59c79e0680aaec8 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 18:02:19 -0800 Subject: [PATCH 19/23] commit with shell --- .circleci/config.yml | 11 +++++++++++ .circleci/trigger_pipeline.sh | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100755 .circleci/trigger_pipeline.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 533c0da743..6a673f15fc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,6 +14,17 @@ parameters: GHA_Meta: type: string default: "" + run_workflow_build: + default: true + type: boolean + + run_workflow_test: + default: true + type: boolean + + run_workflow_lint: + default: true + type: boolean orbs: node: circleci/node@5.1.0 diff --git a/.circleci/trigger_pipeline.sh b/.circleci/trigger_pipeline.sh new file mode 100755 index 0000000000..aaf6f8be31 --- /dev/null +++ b/.circleci/trigger_pipeline.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +curl --request POST \ + --url https://circleci.com/api/v2/project/gh/bacalhau-project/bacalhau/pipeline \ + --header "\"Circle-Token\": \"${1}\"" \ + --header 'content-type: application/json' \ + --data '{"parameters":{"run_workflow_lint": true }}' \ No newline at end of file From 4f861b3d24b21b11323a3a9476fd5ba56ebc6bfc Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 18:25:45 -0800 Subject: [PATCH 20/23] now triggering CircleCI with curl --- .circleci/trigger_pipeline.sh | 11 ++++++----- .github/workflows/circleci.yml | 6 ++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.circleci/trigger_pipeline.sh b/.circleci/trigger_pipeline.sh index aaf6f8be31..436c8c788e 100755 --- a/.circleci/trigger_pipeline.sh +++ b/.circleci/trigger_pipeline.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -curl --request POST \ - --url https://circleci.com/api/v2/project/gh/bacalhau-project/bacalhau/pipeline \ - --header "\"Circle-Token\": \"${1}\"" \ - --header 'content-type: application/json' \ - --data '{"parameters":{"run_workflow_lint": true }}' \ No newline at end of file +curl -X POST --header "Content-Type: application/json" --header "Circle-Token: ${CIRCLE_TOKEN}" -d "{ + \"parameters\": { + \"GHA_Action\": \"trigger_pipeline\" + }, + \"branch\": \"${BRANCH}\" +}" https://circleci.com/api/v2/project/gh/bacalhau-project/bacalhau/pipeline \ No newline at end of file diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index e88960b019..03512c69fc 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -16,7 +16,9 @@ jobs: - uses: LedgerHQ/actions/gh-context@main - name: Trigger CircleCI id: trigger-circle-ci - uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.1.0 + run: | + ./.cirlceci/trigger_pipeline.sh env: - circle_ci_token: ${{ secrets.CIRCLE_CI_TOKEN }} + CIRCLE_TOKEN: ${{ secrets.CIRCLE_CI_TOKEN }} + BRANCH: ${{ github.event.pull_request.head.ref }} From 002008e2daa735a698ec45c31ff5593e1318ef6a Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 18:28:15 -0800 Subject: [PATCH 21/23] fixing spelling --- .github/workflows/circleci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 03512c69fc..9bfde6011c 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -17,7 +17,7 @@ jobs: - name: Trigger CircleCI id: trigger-circle-ci run: | - ./.cirlceci/trigger_pipeline.sh + ./.circleci/trigger_pipeline.sh env: CIRCLE_TOKEN: ${{ secrets.CIRCLE_CI_TOKEN }} BRANCH: ${{ github.event.pull_request.head.ref }} From d0da8c24b22459774240ff0a843d9b33428897c1 Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Mon, 22 Jan 2024 18:30:14 -0800 Subject: [PATCH 22/23] adding checkout --- .github/workflows/circleci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 9bfde6011c..1281d6bd04 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -14,6 +14,7 @@ jobs: name: Pull Request Triggered CircleCI steps: - uses: LedgerHQ/actions/gh-context@main + - uses: actions/checkout@v3 - name: Trigger CircleCI id: trigger-circle-ci run: | From ac320133518145e884bf0e9816ed37519af0fa3d Mon Sep 17 00:00:00 2001 From: David Aronchick Date: Wed, 24 Jan 2024 09:12:08 -0800 Subject: [PATCH 23/23] ensuring up to date --- README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f64e598997..120fa8a9ef 100644 --- a/README.md +++ b/README.md @@ -37,16 +37,19 @@ [Bacalhau](https://www.bacalhau.org/) is a platform for fast, cost efficient, and secure computation by running jobs where the data is generated and stored. With Bacalhau you can streamline your existing workflows without the need of extensive rewriting by running arbitrary Docker containers and WebAssembly (wasm) images as tasks. ## Table of Contents -- [Why Bacalhau](#why-bacalhau) -- [Getting started](#getting-started---bacalhau-in-1-minute) +- [Table of Contents](#table-of-contents) +- [Why Bacalhau?](#why-bacalhau) +- [Getting started - Bacalhau in 1 minute](#getting-started---bacalhau-in-1-minute) - [Learn more](#learn-more) - [Documentation](#documentation) - [Developers guide](#developers-guide) - [Running Bacalhau locally](#running-bacalhau-locally) - [Notes for Dev contributors](#notes-for-dev-contributors) -- [Ways to contribute ](#ways-to-contribute) -- [Current state of Bacalhau](#current-state-of-bacalhau-) -- [License](#license) + - [OpenAPI](#openapi) + - [Python Libraries](#python-libraries) +- [Issues, feature requests, and questions](#issues-feature-requests-and-questions) +- [Ways to contribute](#ways-to-contribute) +- [Open Source](#open-source) ## Why Bacalhau? - :zap: **Fast job processing**: Jobs in Bacalhau are processed where the data was created and all jobs are parallel by default. @@ -161,5 +164,4 @@ Others are allowed to make their own distribution of the software, but they cann We explicitly grant permission for you to make a build that includes our trademarks while developing Bacalhau software itself. You may not publish or share the build, and you may not use that build to run Bacalhau software for any other purpose. -We have borrowed the above Open Source clause from the excellent [System Initiative](https://github.com/systeminit/si/blob/main/CONTRIBUTING.md) - +We have borrowed the above Open Source clause from the excellent [System Initiative](https://github.com/systeminit/si/blob/main/CONTRIBUTING.md) \ No newline at end of file