From 0d9ed9271dcdd3f8bc51aff08a7f04493b54f53d Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 18 Jul 2025 12:37:14 -0300 Subject: [PATCH 01/55] new branch From 3b319073cdef585a4f54dd4bafe2347ca0fc71a4 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 18 Jul 2025 12:41:19 -0300 Subject: [PATCH 02/55] run builds on all branches --- .github/workflows/ci-test.yaml | 3 +-- bin/first-build.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 3d633fb..9c07e84 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -3,8 +3,7 @@ name: Build and Run Check Tests on: push: branches: - - master - - develop + - '**' pull_request: branches: diff --git a/bin/first-build.sh b/bin/first-build.sh index ce7ebce..935f9e4 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -1,7 +1,7 @@ #!/bin/bash # Go to the develop branch of each repository -git submodule foreach bash -c 'git checkout develop || git checkout master' +git submodule foreach bash -c 'git checkout develop || git checkout master || git checkout main' # Copy the example files find . -name '*.example' -not -path '*apollo*' | while read f; do cp "$f" "${f%%.example}"; done @@ -18,5 +18,5 @@ replace_secret 'check-api' 'config/config.yml' 'google_client_id' replace_secret 'check-api' 'config/config.yml' 'google_client_secret' # Build & Run -docker compose build +docker compose build --pull --no-cache docker compose up --abort-on-container-exit From cbb0c01dcea99afb60120af246370c82d515dc05 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 18 Jul 2025 12:47:57 -0300 Subject: [PATCH 03/55] more debugging --- bin/first-build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/first-build.sh b/bin/first-build.sh index 935f9e4..a33a5d7 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -17,6 +17,9 @@ replace_secret () { replace_secret 'check-api' 'config/config.yml' 'google_client_id' replace_secret 'check-api' 'config/config.yml' 'google_client_secret' +cd check-mark && git status && cd .. +cat check-mark/Dockerfile + # Build & Run docker compose build --pull --no-cache docker compose up --abort-on-container-exit From e4594dc16034dd15102900a4eeea795ff69dbaf3 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 18 Jul 2025 12:51:41 -0300 Subject: [PATCH 04/55] more debugging --- bin/first-build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index a33a5d7..9b77e5b 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -17,7 +17,8 @@ replace_secret () { replace_secret 'check-api' 'config/config.yml' 'google_client_id' replace_secret 'check-api' 'config/config.yml' 'google_client_secret' -cd check-mark && git status && cd .. +echo "Check Mark Branch and Dockerfile:" +cd check-mark && git status && git pull origin develop && cd .. cat check-mark/Dockerfile # Build & Run From 4ce77629ac1096af8bbd2c38f0eb055deef902ab Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 18 Jul 2025 14:15:57 -0300 Subject: [PATCH 05/55] debug presto branch --- bin/first-build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/first-build.sh b/bin/first-build.sh index 9b77e5b..f8db1cd 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -20,6 +20,8 @@ replace_secret 'check-api' 'config/config.yml' 'google_client_secret' echo "Check Mark Branch and Dockerfile:" cd check-mark && git status && git pull origin develop && cd .. cat check-mark/Dockerfile +cd presto && git status && git pull origin develop && cd .. + # Build & Run docker compose build --pull --no-cache From b7d40492f18749b48737d1ef650697f1386c1dcb Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 18 Jul 2025 14:31:41 -0300 Subject: [PATCH 06/55] debug From 9971cbfdff9d9267ec818afaa2fb70438a41b3e2 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 18 Jul 2025 15:15:55 -0300 Subject: [PATCH 07/55] update first-build script --- bin/first-build.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index f8db1cd..cf5044a 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -1,7 +1,7 @@ #!/bin/bash # Go to the develop branch of each repository -git submodule foreach bash -c 'git checkout develop || git checkout master || git checkout main' +git submodule foreach bash -c '(git checkout develop || git checkout master || git checkout main) && git pull' # Copy the example files find . -name '*.example' -not -path '*apollo*' | while read f; do cp "$f" "${f%%.example}"; done @@ -17,11 +17,9 @@ replace_secret () { replace_secret 'check-api' 'config/config.yml' 'google_client_id' replace_secret 'check-api' 'config/config.yml' 'google_client_secret' -echo "Check Mark Branch and Dockerfile:" -cd check-mark && git status && git pull origin develop && cd .. +# echo "Check Mark Branch and Dockerfile:" +# cd check-mark && git status && git pull origin develop && cd .. cat check-mark/Dockerfile -cd presto && git status && git pull origin develop && cd .. - # Build & Run docker compose build --pull --no-cache From 3a7cc16bef8f0e57adf2fe805d8f087ea8380e67 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Tue, 22 Jul 2025 11:38:13 -0300 Subject: [PATCH 08/55] more debug --- bin/first-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index cf5044a..2b21c5e 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -23,4 +23,4 @@ cat check-mark/Dockerfile # Build & Run docker compose build --pull --no-cache -docker compose up --abort-on-container-exit +# docker compose up --abort-on-container-exit From 459d503f0e40a68edc42052ff5925462111d5c2f Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Tue, 22 Jul 2025 11:53:06 -0300 Subject: [PATCH 09/55] debug presto --- bin/first-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index 2b21c5e..c88e27d 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -20,7 +20,7 @@ replace_secret 'check-api' 'config/config.yml' 'google_client_secret' # echo "Check Mark Branch and Dockerfile:" # cd check-mark && git status && git pull origin develop && cd .. cat check-mark/Dockerfile - +cat presto/requirements.txt # Build & Run docker compose build --pull --no-cache # docker compose up --abort-on-container-exit From e749b64b1b55acee9fed01a79a2a30c44d8893a7 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Tue, 22 Jul 2025 12:56:06 -0300 Subject: [PATCH 10/55] try to fix problem with presto --- bin/first-build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index c88e27d..ac84b15 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -1,7 +1,7 @@ #!/bin/bash # Go to the develop branch of each repository -git submodule foreach bash -c '(git checkout develop || git checkout master || git checkout main) && git pull' +git submodule foreach bash -c ' git clean -fd (git checkout develop || git checkout master || git checkout main) && git pull' # Copy the example files find . -name '*.example' -not -path '*apollo*' | while read f; do cp "$f" "${f%%.example}"; done @@ -20,6 +20,7 @@ replace_secret 'check-api' 'config/config.yml' 'google_client_secret' # echo "Check Mark Branch and Dockerfile:" # cd check-mark && git status && git pull origin develop && cd .. cat check-mark/Dockerfile +echo "Presto Requirements:" cat presto/requirements.txt # Build & Run docker compose build --pull --no-cache From 870fb5a4004c49bdb4c8741df84512409415a832 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Tue, 22 Jul 2025 13:02:53 -0300 Subject: [PATCH 11/55] try to fix conflict and change the presto branch --- bin/first-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index ac84b15..d669557 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -1,7 +1,7 @@ #!/bin/bash # Go to the develop branch of each repository -git submodule foreach bash -c ' git clean -fd (git checkout develop || git checkout master || git checkout main) && git pull' +git submodule foreach bash -c 'git reset --hard && git clean -fdx && (git checkout develop || git checkout master || git checkout main) && git pull' # Copy the example files find . -name '*.example' -not -path '*apollo*' | while read f; do cp "$f" "${f%%.example}"; done From ddbc5ff0322f0e5128c97d25fa617e1843c2d288 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Tue, 22 Jul 2025 13:15:26 -0300 Subject: [PATCH 12/55] try to simplify github checkout command --- .github/workflows/ci-test.yaml | 3 +-- bin/first-build.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 9c07e84..07ca2a9 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -42,8 +42,7 @@ jobs: sed -i '/git submodule/d' bin/first-build.sh sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh TAB=$'\t' - export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") - git submodule foreach 'bash -c "git checkout master ; git checkout develop ; git checkout $FALLBACK_BRANCH ; git checkout $GITHUB_BRANCH ; exit 0"' + git submodule foreach bash -c 'git reset --hard && git clean -fdx && (git checkout $GITHUB_BRANCH || git checkout develop || git checkout master || git checkout main || ) && git pull' git submodule foreach git rev-parse --abbrev-ref HEAD - name: Run Script diff --git a/bin/first-build.sh b/bin/first-build.sh index d669557..541e4c2 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -1,7 +1,7 @@ #!/bin/bash # Go to the develop branch of each repository -git submodule foreach bash -c 'git reset --hard && git clean -fdx && (git checkout develop || git checkout master || git checkout main) && git pull' +git submodule foreach bash -c '(git checkout develop || git checkout master || git checkout main) && git pull' # Copy the example files find . -name '*.example' -not -path '*apollo*' | while read f; do cp "$f" "${f%%.example}"; done From 3e98573c0a6afaf363623d583f14a2c16c496f3c Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Tue, 22 Jul 2025 13:17:58 -0300 Subject: [PATCH 13/55] fix syntax --- .github/workflows/ci-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 07ca2a9..345bfcc 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -42,7 +42,7 @@ jobs: sed -i '/git submodule/d' bin/first-build.sh sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh TAB=$'\t' - git submodule foreach bash -c 'git reset --hard && git clean -fdx && (git checkout $GITHUB_BRANCH || git checkout develop || git checkout master || git checkout main || ) && git pull' + git submodule foreach bash -c 'git reset --hard && git clean -fdx && (git checkout $GITHUB_BRANCH || git checkout develop || git checkout master || git checkout main ) && git pull' git submodule foreach git rev-parse --abbrev-ref HEAD - name: Run Script From 24e828869d2c7e66765b4ec26ba2769952441a13 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Tue, 22 Jul 2025 13:22:33 -0300 Subject: [PATCH 14/55] fix syntax --- .github/workflows/ci-test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 345bfcc..ba4b7a8 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -42,7 +42,8 @@ jobs: sed -i '/git submodule/d' bin/first-build.sh sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh TAB=$'\t' - git submodule foreach bash -c 'git reset --hard && git clean -fdx && (git checkout $GITHUB_BRANCH || git checkout develop || git checkout master || git checkout main ) && git pull' + export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") + git submodule foreach bash -c 'git reset --hard && git clean -fdx && (git checkout $GITHUB_BRANCH || git checkout develop || git checkout master || git checkout main || git checkout $FALLBACK_BRANCH) && exit 0' git submodule foreach git rev-parse --abbrev-ref HEAD - name: Run Script From d8a8f57a8b1c908ca1165473b42b2bf754b0e3e1 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Tue, 22 Jul 2025 13:59:37 -0300 Subject: [PATCH 15/55] fix syntax --- .github/workflows/ci-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index ba4b7a8..a606c41 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -43,7 +43,7 @@ jobs: sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh TAB=$'\t' export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") - git submodule foreach bash -c 'git reset --hard && git clean -fdx && (git checkout $GITHUB_BRANCH || git checkout develop || git checkout master || git checkout main || git checkout $FALLBACK_BRANCH) && exit 0' + git submodule foreach bash -c 'git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"' git submodule foreach git rev-parse --abbrev-ref HEAD - name: Run Script From ecc13c5103d7ad2a11b06689c0969e1640a18726 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Wed, 23 Jul 2025 08:54:06 -0300 Subject: [PATCH 16/55] try to fix preto issues --- .github/workflows/ci-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index a606c41..d8b04fb 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -11,7 +11,7 @@ on: permissions: id-token: write - contents: read + contents: write jobs: check-script: @@ -43,7 +43,7 @@ jobs: sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh TAB=$'\t' export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") - git submodule foreach bash -c 'git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"' + git submodule foreach bash -c 'git reset --hard && git clean -fdx && git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"' git submodule foreach git rev-parse --abbrev-ref HEAD - name: Run Script From d8b81c98d28a1799dccf54628017357443a25606 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Wed, 23 Jul 2025 08:58:45 -0300 Subject: [PATCH 17/55] try to fix preto issues --- .github/workflows/ci-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index d8b04fb..080323d 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -43,7 +43,7 @@ jobs: sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh TAB=$'\t' export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") - git submodule foreach bash -c 'git reset --hard && git clean -fdx && git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"' + git submodule foreach bash -c 'git reset --hard && git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"' git submodule foreach git rev-parse --abbrev-ref HEAD - name: Run Script From f803beae9936ae6eaa6c3c76e26d9fc116cd35e3 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Wed, 23 Jul 2025 09:04:04 -0300 Subject: [PATCH 18/55] try to fix preto issues --- .github/workflows/ci-test.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 080323d..bc94a9e 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -31,7 +31,12 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - + + - name: Fix file permissions + run: | + sudo chmod -R u+w . + sudo chown -R $USER:$USER . + - name: Before script env: GITHUB_BRANCH: ${{ github.head_ref || github.ref_name }} From c63c5ed4b5eea4c478209562e81253cdc86c55df Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Wed, 23 Jul 2025 09:21:50 -0300 Subject: [PATCH 19/55] try to fix queue_worker issues --- bin/first-build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index 541e4c2..6ff398d 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -23,5 +23,6 @@ cat check-mark/Dockerfile echo "Presto Requirements:" cat presto/requirements.txt # Build & Run -docker compose build --pull --no-cache +docker-compose build queue_worker +docker compose build # docker compose up --abort-on-container-exit From cadbf009226727532075a277eff6088c1149ccf2 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Wed, 23 Jul 2025 09:33:39 -0300 Subject: [PATCH 20/55] try to fix queue_worker issues --- bin/first-build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/first-build.sh b/bin/first-build.sh index 6ff398d..b18f91c 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -23,6 +23,7 @@ cat check-mark/Dockerfile echo "Presto Requirements:" cat presto/requirements.txt # Build & Run +docker-compose build alegre docker-compose build queue_worker docker compose build # docker compose up --abort-on-container-exit From 15906a52b262294d0bbf976f21a7d94cd7009fa0 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Wed, 23 Jul 2025 09:54:42 -0300 Subject: [PATCH 21/55] try to fix queue_worker issues --- bin/first-build.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bin/first-build.sh b/bin/first-build.sh index b18f91c..a8ff9d5 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -22,8 +22,15 @@ replace_secret 'check-api' 'config/config.yml' 'google_client_secret' cat check-mark/Dockerfile echo "Presto Requirements:" cat presto/requirements.txt +echo "Alegre Requirements:" +cat alegre/requirements.txt + # Build & Run +echo "Building Alegre image..." docker-compose build alegre +echo "Building Presto images..." +docker-compose build presto-server presto-image presto-audio presto-video +echo "Building Queue Worker image..." docker-compose build queue_worker docker compose build # docker compose up --abort-on-container-exit From 478ba9bdc11c31bbe7571a1016c0cc93a9ce9186 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Wed, 23 Jul 2025 10:46:36 -0300 Subject: [PATCH 22/55] try to fix queue_worker issues --- bin/first-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index a8ff9d5..5cecde1 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -32,5 +32,5 @@ echo "Building Presto images..." docker-compose build presto-server presto-image presto-audio presto-video echo "Building Queue Worker image..." docker-compose build queue_worker -docker compose build +#docker compose build # docker compose up --abort-on-container-exit From fb288b4bdeaebbf63dc72aa72f92d04581b7d4a1 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Wed, 23 Jul 2025 10:59:03 -0300 Subject: [PATCH 23/55] debug --- bin/first-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index 5cecde1..843a53c 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -30,7 +30,7 @@ echo "Building Alegre image..." docker-compose build alegre echo "Building Presto images..." docker-compose build presto-server presto-image presto-audio presto-video -echo "Building Queue Worker image..." -docker-compose build queue_worker +# echo "Building Queue Worker image..." +# docker-compose build queue_worker #docker compose build # docker compose up --abort-on-container-exit From 9fecb80055cf4e30edd1c65cedde60a6240cdb43 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Wed, 23 Jul 2025 11:01:50 -0300 Subject: [PATCH 24/55] debug --- bin/first-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index 843a53c..9a91b93 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -27,9 +27,9 @@ cat alegre/requirements.txt # Build & Run echo "Building Alegre image..." -docker-compose build alegre +docker compose build alegre echo "Building Presto images..." -docker-compose build presto-server presto-image presto-audio presto-video +docker compose build presto-server presto-image presto-audio presto-video # echo "Building Queue Worker image..." # docker-compose build queue_worker #docker compose build From 89768476b09e940e84fdad53fd3ec7edb65ba2b0 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Wed, 23 Jul 2025 11:41:23 -0300 Subject: [PATCH 25/55] debug --- .github/workflows/ci-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index bc94a9e..757157a 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -11,7 +11,7 @@ on: permissions: id-token: write - contents: write + contents: read jobs: check-script: From 7013531173aa6316df37779e5e504ad40a1e6b7a Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Thu, 24 Jul 2025 07:06:05 -0300 Subject: [PATCH 26/55] comment presto images --- bin/first-build.sh | 6 +-- docker-compose.yml | 100 ++++++++++++++++++++++----------------------- docker-test.yml | 18 ++++---- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index 9a91b93..3ef8393 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -29,8 +29,8 @@ cat alegre/requirements.txt echo "Building Alegre image..." docker compose build alegre echo "Building Presto images..." -docker compose build presto-server presto-image presto-audio presto-video -# echo "Building Queue Worker image..." -# docker-compose build queue_worker +docker compose build presto-server +echo "Building Queue Worker image..." +docker compose build queue_worker #docker compose build # docker compose up --abort-on-container-exit diff --git a/docker-compose.yml b/docker-compose.yml index fae7c21..16fcdbd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -217,53 +217,53 @@ services: depends_on: elasticmq: condition: service_healthy - presto-image: - build: presto - platform: linux/amd64 - volumes: - - "./presto:/app" - env_file: - - presto/.env_file - environment: - ROLE: worker - MODEL_NAME: image.Model - networks: - - dev - depends_on: - elasticmq: - condition: service_healthy - presto-audio: - build: presto - platform: linux/amd64 - volumes: - - "./presto:/app" - env_file: - - presto/.env_file - environment: - ROLE: worker - MODEL_NAME: audio.Model - networks: - - dev - depends_on: - elasticmq: - condition: service_healthy - presto-video: - build: presto - platform: linux/amd64 - volumes: - - "./presto:/app" - env_file: - - presto/.env_file - environment: - ROLE: worker - MODEL_NAME: video.Model - networks: - - dev - depends_on: - elasticmq: - condition: service_healthy - minio: - condition: service_healthy + # presto-image: + # build: presto + # platform: linux/amd64 + # volumes: + # - "./presto:/app" + # env_file: + # - presto/.env_file + # environment: + # ROLE: worker + # MODEL_NAME: image.Model + # networks: + # - dev + # depends_on: + # elasticmq: + # condition: service_healthy + # presto-audio: + # build: presto + # platform: linux/amd64 + # volumes: + # - "./presto:/app" + # env_file: + # - presto/.env_file + # environment: + # ROLE: worker + # MODEL_NAME: audio.Model + # networks: + # - dev + # depends_on: + # elasticmq: + # condition: service_healthy + # presto-video: + # build: presto + # platform: linux/amd64 + # volumes: + # - "./presto:/app" + # env_file: + # - presto/.env_file + # environment: + # ROLE: worker + # MODEL_NAME: video.Model + # networks: + # - dev + # depends_on: + # elasticmq: + # condition: service_healthy + # minio: + # condition: service_healthy # presto-mean-tokens: # build: presto # platform: linux/amd64 @@ -307,9 +307,9 @@ services: - redis - elasticsearch - presto-server - - presto-image - - presto-audio - - presto-video + # - presto-image + # - presto-audio + # - presto-video env_file: - alegre/.env_file networks: diff --git a/docker-test.yml b/docker-test.yml index 69b4e92..6f5a391 100644 --- a/docker-test.yml +++ b/docker-test.yml @@ -57,15 +57,15 @@ services: BOILERPLATE_ENV: test PRESTO_PORT: 8000 REDIS_DATABASE: 3 - presto-audio: - environment: - BOILERPLATE_ENV: test - presto-image: - environment: - BOILERPLATE_ENV: test - presto-video: - environment: - BOILERPLATE_ENV: test + # presto-audio: + # environment: + # BOILERPLATE_ENV: test + # presto-image: + # environment: + # BOILERPLATE_ENV: test + # presto-video: + # environment: + # BOILERPLATE_ENV: test # presto-mean-tokens: # environment: # BOILERPLATE_ENV: test From ed81c4d08b6c9c46d7cf28dbffdafbe4bfd76aae Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Thu, 24 Jul 2025 08:00:54 -0300 Subject: [PATCH 27/55] debug --- bin/first-build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index 3ef8393..5129581 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -19,17 +19,17 @@ replace_secret 'check-api' 'config/config.yml' 'google_client_secret' # echo "Check Mark Branch and Dockerfile:" # cd check-mark && git status && git pull origin develop && cd .. -cat check-mark/Dockerfile -echo "Presto Requirements:" -cat presto/requirements.txt +# cat check-mark/Dockerfile +# echo "Presto Requirements:" +# cat presto/requirements.txt echo "Alegre Requirements:" cat alegre/requirements.txt # Build & Run -echo "Building Alegre image..." -docker compose build alegre echo "Building Presto images..." docker compose build presto-server +echo "Building Alegre image..." +docker compose build alegre echo "Building Queue Worker image..." docker compose build queue_worker #docker compose build From f612b86b5502754c9fcc422c05fc81d18307a06d Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Thu, 24 Jul 2025 15:00:37 -0300 Subject: [PATCH 28/55] debug alegre --- bin/first-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index 5129581..43dba78 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -30,7 +30,7 @@ echo "Building Presto images..." docker compose build presto-server echo "Building Alegre image..." docker compose build alegre -echo "Building Queue Worker image..." -docker compose build queue_worker +# echo "Building Queue Worker image..." +# docker compose build queue_worker #docker compose build # docker compose up --abort-on-container-exit From 1141e79c4f5b9df91aed6ff52e40c84a347114e0 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Thu, 31 Jul 2025 13:42:34 -0300 Subject: [PATCH 29/55] debug Alegre --- bin/first-build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index 43dba78..adb78ca 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -23,11 +23,12 @@ replace_secret 'check-api' 'config/config.yml' 'google_client_secret' # echo "Presto Requirements:" # cat presto/requirements.txt echo "Alegre Requirements:" +cat alegre/Dockerfile cat alegre/requirements.txt # Build & Run -echo "Building Presto images..." -docker compose build presto-server +# echo "Building Presto images..." +# docker compose build presto-server echo "Building Alegre image..." docker compose build alegre # echo "Building Queue Worker image..." From 5d6452e9d00dc3f7713a052e82260673dd85aacd Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Tue, 5 Aug 2025 12:21:52 -0300 Subject: [PATCH 30/55] test Alegre From 8fd03f52f54bf522338d003cc5aac258651f454b Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Tue, 5 Aug 2025 14:39:33 -0300 Subject: [PATCH 31/55] build and up all containers --- bin/first-build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index adb78ca..27bd4fb 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -29,9 +29,9 @@ cat alegre/requirements.txt # Build & Run # echo "Building Presto images..." # docker compose build presto-server -echo "Building Alegre image..." -docker compose build alegre +# echo "Building Alegre image..." +# docker compose build alegre # echo "Building Queue Worker image..." # docker compose build queue_worker -#docker compose build -# docker compose up --abort-on-container-exit +docker compose build +docker compose up --abort-on-container-exit From 2a28a208154a577160c35c0c43367b44ce22e73c Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Tue, 5 Aug 2025 16:16:49 -0300 Subject: [PATCH 32/55] debug check web error --- bin/first-build.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index 27bd4fb..1127114 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -25,13 +25,8 @@ replace_secret 'check-api' 'config/config.yml' 'google_client_secret' echo "Alegre Requirements:" cat alegre/Dockerfile cat alegre/requirements.txt +cat check-web/Dockerfile # Build & Run -# echo "Building Presto images..." -# docker compose build presto-server -# echo "Building Alegre image..." -# docker compose build alegre -# echo "Building Queue Worker image..." -# docker compose build queue_worker docker compose build docker compose up --abort-on-container-exit From a01c4efebf6fd395030d70bf1a97bc07c3a85082 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Tue, 5 Aug 2025 19:25:24 -0300 Subject: [PATCH 33/55] debug only check web --- bin/first-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index 1127114..6ddd386 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -28,5 +28,5 @@ cat alegre/requirements.txt cat check-web/Dockerfile # Build & Run -docker compose build -docker compose up --abort-on-container-exit +docker compose build web +# docker compose up --abort-on-container-exit From 3926d2358a575b6162ba38a5a20530e11dc5d721 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Tue, 5 Aug 2025 19:36:19 -0300 Subject: [PATCH 34/55] more check web debug --- bin/first-build.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index 6ddd386..a61a661 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -22,10 +22,13 @@ replace_secret 'check-api' 'config/config.yml' 'google_client_secret' # cat check-mark/Dockerfile # echo "Presto Requirements:" # cat presto/requirements.txt -echo "Alegre Requirements:" -cat alegre/Dockerfile -cat alegre/requirements.txt +# echo "Alegre Requirements:" +# cat alegre/Dockerfile +# cat alegre/requirements.txt cat check-web/Dockerfile +cd check-web && git status && git pull origin develop && cd .. +cat check-web/Dockerfile + # Build & Run docker compose build web From 4be55f3acaa779fb831a4399ada2c05fad3c330c Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Tue, 5 Aug 2025 19:45:17 -0300 Subject: [PATCH 35/55] testing... --- bin/first-build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index a61a661..9d5c411 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -25,11 +25,11 @@ replace_secret 'check-api' 'config/config.yml' 'google_client_secret' # echo "Alegre Requirements:" # cat alegre/Dockerfile # cat alegre/requirements.txt -cat check-web/Dockerfile +# cat check-web/Dockerfile cd check-web && git status && git pull origin develop && cd .. -cat check-web/Dockerfile +# cat check-web/Dockerfile # Build & Run -docker compose build web -# docker compose up --abort-on-container-exit +docker compose build +docker compose up --abort-on-container-exit From 721d213eaf64666bdad072be431f08ff73a58bc0 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 11:26:05 -0300 Subject: [PATCH 36/55] test if it is a cache problem From cb505982d7a39b2ea5d41ce1277ccc94515a7739 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 11:27:41 -0300 Subject: [PATCH 37/55] commend pull check web --- bin/first-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/first-build.sh b/bin/first-build.sh index 9d5c411..ffa95ca 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -26,7 +26,7 @@ replace_secret 'check-api' 'config/config.yml' 'google_client_secret' # cat alegre/Dockerfile # cat alegre/requirements.txt # cat check-web/Dockerfile -cd check-web && git status && git pull origin develop && cd .. +# cd check-web && git status && git pull origin develop && cd .. # cat check-web/Dockerfile From 70a2e466252c4b6098cdc13f2b5a6ddf0832a6ae Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 11:34:36 -0300 Subject: [PATCH 38/55] try to fix: submodules checkout to fix conflicts --- .github/workflows/ci-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 757157a..c91db74 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -48,7 +48,7 @@ jobs: sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh TAB=$'\t' export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") - git submodule foreach bash -c 'git reset --hard && git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"' + git submodule foreach bash -c 'git reset --hard && git clean -fd && git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"' git submodule foreach git rev-parse --abbrev-ref HEAD - name: Run Script From 2898f6b49b8a51d13223c9083f6ad42f9dfea782 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 11:59:30 -0300 Subject: [PATCH 39/55] try to fix: submodules checkout to fix conflicts --- .github/workflows/ci-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index c91db74..d2a2e1a 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -48,7 +48,7 @@ jobs: sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh TAB=$'\t' export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") - git submodule foreach bash -c 'git reset --hard && git clean -fd && git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"' + git submodule foreach bash -c 'git checkout . && git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"' git submodule foreach git rev-parse --abbrev-ref HEAD - name: Run Script From ae26ca93d7dc8d5d80450e06d2421801e2f194fb Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 12:41:13 -0300 Subject: [PATCH 40/55] try to fix: submodules checkout to fix conflicts --- .github/workflows/ci-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index d2a2e1a..9b7f5ae 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -48,7 +48,7 @@ jobs: sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh TAB=$'\t' export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") - git submodule foreach bash -c 'git checkout . && git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"' + git submodule foreach bash -c 'git status && git checkout . && git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"' git submodule foreach git rev-parse --abbrev-ref HEAD - name: Run Script From d6559bab8f30c1766850e82cbe7036f75185e79f Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 12:51:24 -0300 Subject: [PATCH 41/55] try to fix: submodules checkout to fix conflicts --- .github/workflows/ci-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 9b7f5ae..4733043 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -48,7 +48,7 @@ jobs: sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh TAB=$'\t' export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") - git submodule foreach bash -c 'git status && git checkout . && git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"' + git submodule foreach bash -c 'git reset --hard && git clean -fdx && git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"' git submodule foreach git rev-parse --abbrev-ref HEAD - name: Run Script From dbc657b35cd2ee9de1823c6c9d476c7cd7bef681 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 13:11:34 -0300 Subject: [PATCH 42/55] try to fix: submodules checkout to fix conflicts --- .github/workflows/ci-test.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 4733043..5074c50 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -48,7 +48,15 @@ jobs: sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh TAB=$'\t' export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") - git submodule foreach bash -c 'git reset --hard && git clean -fdx && git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"' + git submodule foreach --recursive git reset --hard + git submodule foreach --recursive git clean -fdx + git submodule foreach --recursive bash -c ' + git checkout "${GITHUB_BRANCH}" \ + || git checkout develop \ + || git checkout master \ + || git checkout main \ + || git checkout "${FALLBACK_BRANCH}"' + git submodule foreach git rev-parse --abbrev-ref HEAD - name: Run Script From 525627e4b736de5873bbec16bfcc4208e04b5840 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 13:14:26 -0300 Subject: [PATCH 43/55] try to fix: submodules checkout to fix conflicts --- .github/workflows/ci-test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 5074c50..eebc635 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -43,6 +43,7 @@ jobs: GITHUB_JOB_NAME: ${{ github.job }} run: | sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules + git submodule sync git submodule update --init --recursive sed -i '/git submodule/d' bin/first-build.sh sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh From cb26bc339e5092ad12c8dd41c0574001f9528d10 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 16:11:34 -0300 Subject: [PATCH 44/55] try to fix: submodules checkout to fix conflicts --- .github/workflows/ci-test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index eebc635..3b0c6a5 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -49,6 +49,7 @@ jobs: sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh TAB=$'\t' export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") + git submodule foreach --recursive bash -c 'git checkout .' git submodule foreach --recursive git reset --hard git submodule foreach --recursive git clean -fdx git submodule foreach --recursive bash -c ' From d35578c9dab92272b9c5190c4a99b440fd1454d8 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 17:18:19 -0300 Subject: [PATCH 45/55] debug containers --- .github/workflows/ci-test.yaml | 3 +-- bin/first-build.sh | 13 ------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 3b0c6a5..1898358 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -43,13 +43,12 @@ jobs: GITHUB_JOB_NAME: ${{ github.job }} run: | sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules + git submodule foreach --recursive bash -c 'git checkout .' git submodule sync git submodule update --init --recursive sed -i '/git submodule/d' bin/first-build.sh - sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh TAB=$'\t' export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") - git submodule foreach --recursive bash -c 'git checkout .' git submodule foreach --recursive git reset --hard git submodule foreach --recursive git clean -fdx git submodule foreach --recursive bash -c ' diff --git a/bin/first-build.sh b/bin/first-build.sh index ffa95ca..5a976ea 100755 --- a/bin/first-build.sh +++ b/bin/first-build.sh @@ -17,19 +17,6 @@ replace_secret () { replace_secret 'check-api' 'config/config.yml' 'google_client_id' replace_secret 'check-api' 'config/config.yml' 'google_client_secret' -# echo "Check Mark Branch and Dockerfile:" -# cd check-mark && git status && git pull origin develop && cd .. -# cat check-mark/Dockerfile -# echo "Presto Requirements:" -# cat presto/requirements.txt -# echo "Alegre Requirements:" -# cat alegre/Dockerfile -# cat alegre/requirements.txt -# cat check-web/Dockerfile -# cd check-web && git status && git pull origin develop && cd .. -# cat check-web/Dockerfile - - # Build & Run docker compose build docker compose up --abort-on-container-exit From 7d1566c8204e40dd4a737b753a6b38515afde18d Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 17:50:45 -0300 Subject: [PATCH 46/55] add 'git pull' comand --- .github/workflows/ci-test.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 1898358..8f4692b 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -51,13 +51,7 @@ jobs: export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") git submodule foreach --recursive git reset --hard git submodule foreach --recursive git clean -fdx - git submodule foreach --recursive bash -c ' - git checkout "${GITHUB_BRANCH}" \ - || git checkout develop \ - || git checkout master \ - || git checkout main \ - || git checkout "${FALLBACK_BRANCH}"' - + git submodule foreach bash -c '(git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}") && git pull' git submodule foreach git rev-parse --abbrev-ref HEAD - name: Run Script From f38e27a60f09589128db66be7085002368fc4be4 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 18:01:19 -0300 Subject: [PATCH 47/55] change branch order in checkout command --- .github/workflows/ci-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 8f4692b..34d7d7b 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -51,7 +51,7 @@ jobs: export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") git submodule foreach --recursive git reset --hard git submodule foreach --recursive git clean -fdx - git submodule foreach bash -c '(git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}") && git pull' + git submodule foreach bash -c '(git checkout "${GITHUB_BRANCH}" || git checkout main || git checkout master || git checkout develop || git checkout "${FALLBACK_BRANCH}") && git pull' git submodule foreach git rev-parse --abbrev-ref HEAD - name: Run Script From 9ce44616a65b0484ee8f6dc64f8b2cb4bb9b9ff9 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 18:03:11 -0300 Subject: [PATCH 48/55] change branch order in checkout command 2 --- .github/workflows/ci-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 34d7d7b..cc835b6 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -51,7 +51,7 @@ jobs: export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") git submodule foreach --recursive git reset --hard git submodule foreach --recursive git clean -fdx - git submodule foreach bash -c '(git checkout "${GITHUB_BRANCH}" || git checkout main || git checkout master || git checkout develop || git checkout "${FALLBACK_BRANCH}") && git pull' + git submodule foreach bash -c '(git checkout "${GITHUB_BRANCH}" || git checkout main || git checkout develop || git checkout master || git checkout "${FALLBACK_BRANCH}") && git pull' git submodule foreach git rev-parse --abbrev-ref HEAD - name: Run Script From 209419c30357aa24e5138664ab3a25401402122f Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 18:52:43 -0300 Subject: [PATCH 49/55] back with -d flag --- .github/workflows/ci-test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index cc835b6..e3ff508 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -43,6 +43,7 @@ jobs: GITHUB_JOB_NAME: ${{ github.job }} run: | sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules + sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh git submodule foreach --recursive bash -c 'git checkout .' git submodule sync git submodule update --init --recursive From 316f1dbac0f31b77b7c04f977cfc377472d476a1 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Fri, 8 Aug 2025 19:25:04 -0300 Subject: [PATCH 50/55] update test after comment presto images --- test/image_names.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/image_names.txt b/test/image_names.txt index 93f834b..4cd4faf 100644 --- a/test/image_names.txt +++ b/test/image_names.txt @@ -8,10 +8,7 @@ check-narcissus check-pender check-pender-background check-postgres -check-presto-audio -check-presto-image check-presto-server -check-presto-video check-queue_worker check-web docker.elastic.co/kibana/kibana:7.9.2 From 3d1acd81afc30ea12bd39ac3cc9a5f7a63d3c89a Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Sat, 9 Aug 2025 12:04:01 -0300 Subject: [PATCH 51/55] clean up debugs --- .github/workflows/ci-test.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index e3ff508..0e72914 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -50,8 +50,6 @@ jobs: sed -i '/git submodule/d' bin/first-build.sh TAB=$'\t' export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") - git submodule foreach --recursive git reset --hard - git submodule foreach --recursive git clean -fdx git submodule foreach bash -c '(git checkout "${GITHUB_BRANCH}" || git checkout main || git checkout develop || git checkout master || git checkout "${FALLBACK_BRANCH}") && git pull' git submodule foreach git rev-parse --abbrev-ref HEAD From d1c23cde2c2a4dca3e60ad6154e8fe87f89aa66d Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Sat, 9 Aug 2025 13:20:45 -0300 Subject: [PATCH 52/55] clean up debugs --- .github/workflows/ci-test.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 0e72914..5f352be 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -32,11 +32,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Fix file permissions - run: | - sudo chmod -R u+w . - sudo chown -R $USER:$USER . - - name: Before script env: GITHUB_BRANCH: ${{ github.head_ref || github.ref_name }} From 647b3c83d572a5c7fb2b002b7177b77e332da829 Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Sat, 9 Aug 2025 15:42:32 -0300 Subject: [PATCH 53/55] clean up debugs --- .github/workflows/ci-test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 5f352be..bcee68d 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -3,7 +3,8 @@ name: Build and Run Check Tests on: push: branches: - - '**' + - master + - develop pull_request: branches: From a35b15d0859f937c77fd237586df3b81246d683e Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Sat, 9 Aug 2025 15:45:58 -0300 Subject: [PATCH 54/55] clean up debugs --- .github/workflows/ci-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index bcee68d..3253525 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -39,11 +39,11 @@ jobs: GITHUB_JOB_NAME: ${{ github.job }} run: | sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules - sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh git submodule foreach --recursive bash -c 'git checkout .' git submodule sync git submodule update --init --recursive sed -i '/git submodule/d' bin/first-build.sh + sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh TAB=$'\t' export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop") git submodule foreach bash -c '(git checkout "${GITHUB_BRANCH}" || git checkout main || git checkout develop || git checkout master || git checkout "${FALLBACK_BRANCH}") && git pull' From 9daac3f5f1034f9446fee233283375d6719831ed Mon Sep 17 00:00:00 2001 From: danielevalverde Date: Sat, 9 Aug 2025 16:03:24 -0300 Subject: [PATCH 55/55] run