From 338f28805d4e6882505e608536ce0e0bd9a91f32 Mon Sep 17 00:00:00 2001 From: drethereum Date: Thu, 24 Apr 2025 16:41:55 -0600 Subject: [PATCH] make file --- .../workflows/dbt_run_scheduled_scores.yml | 20 --------------- makefile | 25 +++++++++++++++++-- packages.yml | 2 +- 3 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 .github/workflows/dbt_run_scheduled_scores.yml diff --git a/.github/workflows/dbt_run_scheduled_scores.yml b/.github/workflows/dbt_run_scheduled_scores.yml deleted file mode 100644 index 5c2f0f9..0000000 --- a/.github/workflows/dbt_run_scheduled_scores.yml +++ /dev/null @@ -1,20 +0,0 @@ - -name: dbt_run_scheduled_scores -run-name: dbt_run_scheduled_scores - -on: - workflow_dispatch: - branches: - - "main" - -concurrency: - group: ${{ github.workflow }} - -jobs: - called_workflow_template: - uses: FlipsideCrypto/fsc-evm/.github/workflows/dbt_run_template.yml@pre-release/v4-beta - with: - command_name: Run Scores Models - command: | - dbt run -m "fsc_evm,tag:scores" - secrets: inherit \ No newline at end of file diff --git a/makefile b/makefile index b9308d4..269b21b 100644 --- a/makefile +++ b/makefile @@ -4,17 +4,38 @@ cleanup_time: @set -e; \ rm -f package-lock.yml && dbt clean && dbt deps +resume_all_gha_tasks: + @set -e; \ + TASK_NAMES=""; \ + for file in $$(find .github/workflows -name "*.yml" -type f); do \ + filename=$$(basename "$$file" .yml); \ + task="TRIGGER_$$(echo $$filename | tr '[:lower:]' '[:upper:]')"; \ + if [ -z "$$TASK_NAMES" ]; then \ + TASK_NAMES="$$task"; \ + else \ + TASK_NAMES="$$TASK_NAMES,$$task"; \ + fi; \ + done; \ + if [ -n "$$TASK_NAMES" ]; then \ + echo "Resuming tasks: $$TASK_NAMES"; \ + dbt run-operation fsc_evm.alter_gha_tasks --args "{\"task_names\": \"$$TASK_NAMES\", \"task_action\": \"RESUME\"}" -t $(DBT_TARGET); \ + else \ + echo "No workflow files found. No tasks to resume."; \ + fi + deploy_github_actions: @set -e; \ dbt run -s livequery_base.deploy.marketplace.github --vars '{"UPDATE_UDFS_AND_SPS":True}' -t $(DBT_TARGET); \ dbt run -m "fsc_evm,tag:gha_tasks" --full-refresh -t $(DBT_TARGET); \ - dbt run-operation fsc_evm.create_gha_tasks --vars '{"START_GHA_TASKS":False}' -t $(DBT_TARGET) + dbt run-operation fsc_evm.create_gha_tasks --vars '{"START_GHA_TASKS":False}' -t $(DBT_TARGET) ; \ + make resume_all_gha_tasks deploy_new_github_action: @set -e; \ dbt run-operation fsc_evm.drop_github_actions_schema -t $(DBT_TARGET); \ dbt run -m "fsc_evm,tag:gha_tasks" --full-refresh -t $(DBT_TARGET); \ - dbt run-operation fsc_evm.create_gha_tasks --vars '{"START_GHA_TASKS":False}' -t $(DBT_TARGET) + dbt run-operation fsc_evm.create_gha_tasks --vars '{"START_GHA_TASKS":False}' -t $(DBT_TARGET) ; \ + make resume_all_gha_tasks deploy_livequery: @set -e; \ diff --git a/packages.yml b/packages.yml index 42ae788..fba3da4 100644 --- a/packages.yml +++ b/packages.yml @@ -1,3 +1,3 @@ packages: - git: https://github.com/FlipsideCrypto/fsc-evm.git - revision: "update/misc-macro-changes" + revision: "AN-5974/gha-tasks"