From ade004b2092a5b6d903ef6b3f8a91f95943f9ece Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 5 Dec 2024 12:50:20 +0200 Subject: [PATCH 01/34] WIP WIP WIP --- .github/workflows/bullmq-tests.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index d51e018398af..8721e40b5b81 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -35,16 +35,19 @@ jobs: cd $GITHUB_WORKSPACE/build cmake .. -DCMAKE_BUILD_TYPE=Debug -GNinja ninja dragonfly - ./dragonfly --alsologtostderr & - - - name: Clone and build BullMQ + ./dragonfly --alsologtostderr --cluster_mode=emulated --lock_on_hashtags --dbfilename= & + - name: Build BullMQ run: | - git clone https://github.com/taskforcesh/bullmq.git + DOWNLOAD_URL=$(curl -s https://api.github.com/repos/taskforcesh/bullmq/releases/latest | jq -r '.tarball_url') + echo "Downloading latest BullMQ release from ${DOWNLOAD_URL}" + wget -O bullmq.tar.gz ${DOWNLOAD_URL} + tar -zxvf bullmq.tar.gz + mv taskforcesh-bullmq-* bullmq cd bullmq pwd - yarn install --ignore-engines --frozen-lockfile --non-interactive + yarn install yarn build - name: Test BullMQ run: | cd $GITHUB_WORKSPACE/bullmq - # yarn test -i -g "should process delayed jobs with several workers respecting delay" + BULLMQ_TEST_PREFIX={b} yarn test From ef8f2160d385d235b5e24448f3d1f5aa37ae1f53 Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 5 Dec 2024 13:11:32 +0200 Subject: [PATCH 02/34] jq --- .github/workflows/bullmq-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 8721e40b5b81..2790274ec4eb 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -25,7 +25,7 @@ jobs: submodules: true - name: Install NodeJs run: | - apk add --no-cache nodejs npm yarn + apk add --no-cache nodejs npm yarn jq node --version npm --version yarn --version From b057e3c6f25ba029d8e5d588b70a1b48237c86de Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 5 Dec 2024 14:47:54 +0200 Subject: [PATCH 03/34] upload logs --- .github/workflows/bullmq-tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 2790274ec4eb..3244711a9981 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -51,3 +51,9 @@ jobs: run: | cd $GITHUB_WORKSPACE/bullmq BULLMQ_TEST_PREFIX={b} yarn test + - name: Upload logs on failure + if: failure() + uses: actions/upload-artifact@v4 + with: + name: unit_logs + path: /tmp/*INFO* From 7b10f2d51c9157a97035b074ebc0305e7641b64b Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 5 Dec 2024 15:46:11 +0200 Subject: [PATCH 04/34] upload all logs --- .github/workflows/bullmq-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 3244711a9981..c85b642630cf 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -56,4 +56,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: unit_logs - path: /tmp/*INFO* + path: /tmp/dragonfly.* From 5e7d4d7f183f43d425946eec98ceada776bc47ad Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 5 Dec 2024 16:11:56 +0200 Subject: [PATCH 05/34] maybe now --- .github/workflows/bullmq-tests.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index c85b642630cf..6adf755021c9 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -36,7 +36,7 @@ jobs: cmake .. -DCMAKE_BUILD_TYPE=Debug -GNinja ninja dragonfly ./dragonfly --alsologtostderr --cluster_mode=emulated --lock_on_hashtags --dbfilename= & - - name: Build BullMQ + - name: Build and Test BullMQ run: | DOWNLOAD_URL=$(curl -s https://api.github.com/repos/taskforcesh/bullmq/releases/latest | jq -r '.tarball_url') echo "Downloading latest BullMQ release from ${DOWNLOAD_URL}" @@ -47,9 +47,6 @@ jobs: pwd yarn install yarn build - - name: Test BullMQ - run: | - cd $GITHUB_WORKSPACE/bullmq BULLMQ_TEST_PREFIX={b} yarn test - name: Upload logs on failure if: failure() From 4f4350fbe9eafd2f0d434f699cfdfdaca0e264b4 Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 5 Dec 2024 21:26:22 +0200 Subject: [PATCH 06/34] path --- .github/workflows/bullmq-tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 6adf755021c9..03e61d3cd9fc 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -38,6 +38,8 @@ jobs: ./dragonfly --alsologtostderr --cluster_mode=emulated --lock_on_hashtags --dbfilename= & - name: Build and Test BullMQ run: | + mkdir -p $GITHUB_WORKSPACE/bullmq + cd $GITHUB_WORKSPACE/bullmq DOWNLOAD_URL=$(curl -s https://api.github.com/repos/taskforcesh/bullmq/releases/latest | jq -r '.tarball_url') echo "Downloading latest BullMQ release from ${DOWNLOAD_URL}" wget -O bullmq.tar.gz ${DOWNLOAD_URL} From 884851f482f000a5b651f4c922729309e0bde711 Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 5 Dec 2024 22:13:29 +0200 Subject: [PATCH 07/34] path2 --- .github/workflows/bullmq-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 03e61d3cd9fc..b4233ad68bc4 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -38,8 +38,8 @@ jobs: ./dragonfly --alsologtostderr --cluster_mode=emulated --lock_on_hashtags --dbfilename= & - name: Build and Test BullMQ run: | - mkdir -p $GITHUB_WORKSPACE/bullmq - cd $GITHUB_WORKSPACE/bullmq + mkdir -p $GITHUB_WORKSPACE/build/bullmq + cd $GITHUB_WORKSPACE/build/bullmq DOWNLOAD_URL=$(curl -s https://api.github.com/repos/taskforcesh/bullmq/releases/latest | jq -r '.tarball_url') echo "Downloading latest BullMQ release from ${DOWNLOAD_URL}" wget -O bullmq.tar.gz ${DOWNLOAD_URL} From 1709dd1c7f57b89fdc966802f758635b5898fa94 Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 5 Dec 2024 22:41:51 +0200 Subject: [PATCH 08/34] path2 --- .github/workflows/bullmq-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index b4233ad68bc4..a62feb567e8b 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -38,8 +38,8 @@ jobs: ./dragonfly --alsologtostderr --cluster_mode=emulated --lock_on_hashtags --dbfilename= & - name: Build and Test BullMQ run: | - mkdir -p $GITHUB_WORKSPACE/build/bullmq - cd $GITHUB_WORKSPACE/build/bullmq + mkdir -p $GITHUB_WORKSPACE/../bullmq + cd $GITHUB_WORKSPACE/../bullmq DOWNLOAD_URL=$(curl -s https://api.github.com/repos/taskforcesh/bullmq/releases/latest | jq -r '.tarball_url') echo "Downloading latest BullMQ release from ${DOWNLOAD_URL}" wget -O bullmq.tar.gz ${DOWNLOAD_URL} From c0e266c42871344f2c573f59ac45ccd14484f2af Mon Sep 17 00:00:00 2001 From: shahar Date: Fri, 6 Dec 2024 07:36:20 +0200 Subject: [PATCH 09/34] release --- .github/workflows/bullmq-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index a62feb567e8b..361b793bf01b 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -33,7 +33,7 @@ jobs: - name: Configure/Build run: | cd $GITHUB_WORKSPACE/build - cmake .. -DCMAKE_BUILD_TYPE=Debug -GNinja + cmake .. -DCMAKE_BUILD_TYPE=Release -GNinja ninja dragonfly ./dragonfly --alsologtostderr --cluster_mode=emulated --lock_on_hashtags --dbfilename= & - name: Build and Test BullMQ From c1e5f2ee49ed9881c01980793091adb667dafc29 Mon Sep 17 00:00:00 2001 From: shahar Date: Tue, 24 Dec 2024 12:32:43 +0200 Subject: [PATCH 10/34] patch bullmq fixes --- .github/workflows/bullmq-tests.yml | 1 + bullmq.patch | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 bullmq.patch diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 361b793bf01b..a4f00efc23b0 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -47,6 +47,7 @@ jobs: mv taskforcesh-bullmq-* bullmq cd bullmq pwd + patch < $GITHUB_WORKSPACE/bullmq.patch yarn install yarn build BULLMQ_TEST_PREFIX={b} yarn test diff --git a/bullmq.patch b/bullmq.patch new file mode 100644 index 000000000000..f68ce33efb1c --- /dev/null +++ b/bullmq.patch @@ -0,0 +1,22 @@ +diff --git a/tests/test_job.ts b/tests/test_job.ts +index 0393fe0..57b06d6 100644 +--- a/tests/test_job.ts ++++ b/tests/test_job.ts +@@ -1396,6 +1396,8 @@ describe('Job', function () { + expect(isDelayedAfterPromote).to.be.equal(false); + const isCompleted = await job.isCompleted(); + expect(isCompleted).to.be.equal(true); ++ ++ await worker.close(); + }); + + describe('when re-adding same repeatable job after previous delayed one is promoted', () => { +@@ -1456,6 +1458,8 @@ describe('Job', function () { + const delayedCountAfterReAddition = await queue.getDelayedCount(); + expect(completedCountAfterReAddition).to.be.equal(1); + expect(delayedCountAfterReAddition).to.be.equal(1); ++ ++ await worker.close(); + }); + }); + }); From d931a99c0383ed940991575b4b623bd46ff100df Mon Sep 17 00:00:00 2001 From: shahar Date: Tue, 24 Dec 2024 13:36:49 +0200 Subject: [PATCH 11/34] patch force --- .github/workflows/bullmq-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index a4f00efc23b0..33c92500c201 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -47,7 +47,7 @@ jobs: mv taskforcesh-bullmq-* bullmq cd bullmq pwd - patch < $GITHUB_WORKSPACE/bullmq.patch + patch -p1 -f < $GITHUB_WORKSPACE/bullmq.patch yarn install yarn build BULLMQ_TEST_PREFIX={b} yarn test From 6469f8f9d65260f91ec73714cf4e900cb559700c Mon Sep 17 00:00:00 2001 From: shahar Date: Wed, 8 Jan 2025 09:16:40 +0200 Subject: [PATCH 12/34] newer node --- .github/workflows/bullmq-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 33c92500c201..8d623467de7d 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -25,7 +25,7 @@ jobs: submodules: true - name: Install NodeJs run: | - apk add --no-cache nodejs npm yarn jq + apk add --no-cache nodejs-current npm yarn jq node --version npm --version yarn --version From 676c85a40dae11ce48d0c729a10c32b82e2b0329 Mon Sep 17 00:00:00 2001 From: shahar Date: Wed, 8 Jan 2025 09:56:05 +0200 Subject: [PATCH 13/34] custom release --- .github/workflows/bullmq-tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 8d623467de7d..0b12b1cc9ddd 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -25,7 +25,10 @@ jobs: submodules: true - name: Install NodeJs run: | - apk add --no-cache nodejs-current npm yarn jq + wget https://unofficial-builds.nodejs.org/download/release/v22.12.0/node-v22.12.0-linux-x64-musl.tar.xz + tar -xf node-v22.12.0-linux-x64-musl.tar.xz + cp -r node-v22.12.0-linux-x64-musl/* /usr/local/ + apk add --no-cache yarn jq node --version npm --version yarn --version From 87112dd6e561572867dd790bdb46b61a759124d9 Mon Sep 17 00:00:00 2001 From: shahar Date: Wed, 8 Jan 2025 10:25:30 +0200 Subject: [PATCH 14/34] v1.24 --- .github/workflows/bullmq-tests.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 0b12b1cc9ddd..f2ed7b7515c8 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -36,8 +36,11 @@ jobs: - name: Configure/Build run: | cd $GITHUB_WORKSPACE/build - cmake .. -DCMAKE_BUILD_TYPE=Release -GNinja - ninja dragonfly + #cmake .. -DCMAKE_BUILD_TYPE=Release -GNinja + #ninja dragonfly + wget https://github.com/dragonflydb/dragonfly/releases/download/v1.24.0/dragonfly-x86_64.tar.gz + tar -zxvf dragonfly-x86_64.tar.gz + mv tar -zxvf dragonfly-x86_64 dragonfly ./dragonfly --alsologtostderr --cluster_mode=emulated --lock_on_hashtags --dbfilename= & - name: Build and Test BullMQ run: | From c5ef378c8947e5ed2f3406e992762d5d7a36a7ea Mon Sep 17 00:00:00 2001 From: shahar Date: Wed, 8 Jan 2025 10:53:33 +0200 Subject: [PATCH 15/34] oops --- .github/workflows/bullmq-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index f2ed7b7515c8..f10c205e0269 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -40,7 +40,7 @@ jobs: #ninja dragonfly wget https://github.com/dragonflydb/dragonfly/releases/download/v1.24.0/dragonfly-x86_64.tar.gz tar -zxvf dragonfly-x86_64.tar.gz - mv tar -zxvf dragonfly-x86_64 dragonfly + mv dragonfly-x86_64 dragonfly ./dragonfly --alsologtostderr --cluster_mode=emulated --lock_on_hashtags --dbfilename= & - name: Build and Test BullMQ run: | From 76d2ad44e3da2ebbdc628512b35a86f0b1273d86 Mon Sep 17 00:00:00 2001 From: shahar Date: Wed, 8 Jan 2025 11:34:20 +0200 Subject: [PATCH 16/34] bullmq head --- .github/workflows/bullmq-tests.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index f10c205e0269..2262b4a72e90 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -48,9 +48,10 @@ jobs: cd $GITHUB_WORKSPACE/../bullmq DOWNLOAD_URL=$(curl -s https://api.github.com/repos/taskforcesh/bullmq/releases/latest | jq -r '.tarball_url') echo "Downloading latest BullMQ release from ${DOWNLOAD_URL}" - wget -O bullmq.tar.gz ${DOWNLOAD_URL} - tar -zxvf bullmq.tar.gz - mv taskforcesh-bullmq-* bullmq + #wget -O bullmq.tar.gz ${DOWNLOAD_URL} + #tar -zxvf bullmq.tar.gz + #mv taskforcesh-bullmq-* bullmq + git clone https://github.com/taskforcesh/bullmq cd bullmq pwd patch -p1 -f < $GITHUB_WORKSPACE/bullmq.patch From 216cde11d987bfc61526d6042fb5e7dd70a78d41 Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 9 Jan 2025 11:48:16 +0200 Subject: [PATCH 17/34] clean ubuntu, no alpine --- .github/workflows/bullmq-tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 2262b4a72e90..0c499f3d71b6 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -12,12 +12,12 @@ jobs: name: Build timeout-minutes: 60 - container: - image: ghcr.io/romange/alpine-dev:latest - options: --security-opt seccomp=unconfined - credentials: - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + #container: + # image: ghcr.io/romange/alpine-dev:latest + # options: --security-opt seccomp=unconfined + # credentials: + # username: ${{ github.repository_owner }} + # password: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v4 From 7ac406fd542ba2c492d1014acf7f3a13b2da3608 Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 9 Jan 2025 11:52:31 +0200 Subject: [PATCH 18/34] node --- .github/workflows/bullmq-tests.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 0c499f3d71b6..02c468ee0c68 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -18,21 +18,25 @@ jobs: # credentials: # username: ${{ github.repository_owner }} # password: ${{ secrets.GITHUB_TOKEN }} + env: + node-version: lts/* steps: - uses: actions/checkout@v4 with: submodules: true - - name: Install NodeJs - run: | - wget https://unofficial-builds.nodejs.org/download/release/v22.12.0/node-v22.12.0-linux-x64-musl.tar.xz - tar -xf node-v22.12.0-linux-x64-musl.tar.xz - cp -r node-v22.12.0-linux-x64-musl/* /usr/local/ - apk add --no-cache yarn jq - node --version - npm --version - yarn --version - mkdir -p $GITHUB_WORKSPACE/build + node-version: lts/* + cache: 'yarn' +# - name: Install NodeJs +# run: | +# wget https://unofficial-builds.nodejs.org/download/release/v22.12.0/node-v22.12.0-linux-x64-musl.tar.xz +# tar -xf node-v22.12.0-linux-x64-musl.tar.xz +# cp -r node-v22.12.0-linux-x64-musl/* /usr/local/ +# apk add --no-cache yarn jq +# node --version +# npm --version +# yarn --version +# mkdir -p $GITHUB_WORKSPACE/build - name: Configure/Build run: | cd $GITHUB_WORKSPACE/build From 455263af130b984e1af2cdfe4ac8fce53b2c6e0a Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 9 Jan 2025 11:55:46 +0200 Subject: [PATCH 19/34] fix --- .github/workflows/bullmq-tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 02c468ee0c68..e3d25288c818 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -27,16 +27,16 @@ jobs: submodules: true node-version: lts/* cache: 'yarn' -# - name: Install NodeJs -# run: | + - name: Install NodeJs # wget https://unofficial-builds.nodejs.org/download/release/v22.12.0/node-v22.12.0-linux-x64-musl.tar.xz # tar -xf node-v22.12.0-linux-x64-musl.tar.xz # cp -r node-v22.12.0-linux-x64-musl/* /usr/local/ # apk add --no-cache yarn jq -# node --version -# npm --version -# yarn --version -# mkdir -p $GITHUB_WORKSPACE/build + run: | + node --version + npm --version + yarn --version + mkdir -p $GITHUB_WORKSPACE/build - name: Configure/Build run: | cd $GITHUB_WORKSPACE/build From 22b0f3d2f4242780096f61f4cec1d6820efdad17 Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 9 Jan 2025 12:14:46 +0200 Subject: [PATCH 20/34] custom node --- .github/workflows/bullmq-tests.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index e3d25288c818..321a04736dc1 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -18,21 +18,19 @@ jobs: # credentials: # username: ${{ github.repository_owner }} # password: ${{ secrets.GITHUB_TOKEN }} - env: - node-version: lts/* + #env: + # node-version: lts/* steps: - uses: actions/checkout@v4 with: submodules: true - node-version: lts/* - cache: 'yarn' - name: Install NodeJs -# wget https://unofficial-builds.nodejs.org/download/release/v22.12.0/node-v22.12.0-linux-x64-musl.tar.xz -# tar -xf node-v22.12.0-linux-x64-musl.tar.xz -# cp -r node-v22.12.0-linux-x64-musl/* /usr/local/ -# apk add --no-cache yarn jq run: | + wget https://unofficial-builds.nodejs.org/download/release/v22.12.0/node-v22.12.0-linux-x64-glibc.tar.xz + tar -xf node-v22.12.0-linux-x64-glibc.tar.xz + cp -r node-v22.12.0-linux-x64-glibc/* /usr/local/ + apk add --no-cache yarn jq node --version npm --version yarn --version From b8b0602d697658b93214dc05b8bb1393642b288f Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 9 Jan 2025 12:16:46 +0200 Subject: [PATCH 21/34] url --- .github/workflows/bullmq-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 321a04736dc1..2d081e03b4ae 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -27,7 +27,7 @@ jobs: submodules: true - name: Install NodeJs run: | - wget https://unofficial-builds.nodejs.org/download/release/v22.12.0/node-v22.12.0-linux-x64-glibc.tar.xz + wget https://unofficial-builds.nodejs.org/download/release/v22.12.0/node-v22.12.0-linux-x64-glibc-217.tar.xz tar -xf node-v22.12.0-linux-x64-glibc.tar.xz cp -r node-v22.12.0-linux-x64-glibc/* /usr/local/ apk add --no-cache yarn jq From 31a6f66c2c4132de7f8a8205c76cd642ab70873d Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 9 Jan 2025 13:14:09 +0200 Subject: [PATCH 22/34] tar.xv --- .github/workflows/bullmq-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 2d081e03b4ae..dc13b1a62a2e 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -28,8 +28,8 @@ jobs: - name: Install NodeJs run: | wget https://unofficial-builds.nodejs.org/download/release/v22.12.0/node-v22.12.0-linux-x64-glibc-217.tar.xz - tar -xf node-v22.12.0-linux-x64-glibc.tar.xz - cp -r node-v22.12.0-linux-x64-glibc/* /usr/local/ + tar -xf node-v22.12.0-linux-x64-glibc-217.tar.xz + cp -r node-v22.12.0-linux-x64-glibc-217/* /usr/local/ apk add --no-cache yarn jq node --version npm --version From 452610353b96075a1789ed560f154bd3784b6bbf Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 9 Jan 2025 13:16:14 +0200 Subject: [PATCH 23/34] sudo --- .github/workflows/bullmq-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index dc13b1a62a2e..0fbede0bca9b 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -29,7 +29,7 @@ jobs: run: | wget https://unofficial-builds.nodejs.org/download/release/v22.12.0/node-v22.12.0-linux-x64-glibc-217.tar.xz tar -xf node-v22.12.0-linux-x64-glibc-217.tar.xz - cp -r node-v22.12.0-linux-x64-glibc-217/* /usr/local/ + sudo cp -r node-v22.12.0-linux-x64-glibc-217/* /usr/local/ apk add --no-cache yarn jq node --version npm --version From 3c5a475fabaad878a929b71fe4b836289ffccb03 Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 9 Jan 2025 13:17:40 +0200 Subject: [PATCH 24/34] apt --- .github/workflows/bullmq-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 0fbede0bca9b..e50ace39b2f2 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -30,7 +30,7 @@ jobs: wget https://unofficial-builds.nodejs.org/download/release/v22.12.0/node-v22.12.0-linux-x64-glibc-217.tar.xz tar -xf node-v22.12.0-linux-x64-glibc-217.tar.xz sudo cp -r node-v22.12.0-linux-x64-glibc-217/* /usr/local/ - apk add --no-cache yarn jq + apt install yarn jq node --version npm --version yarn --version From c1ecf6594cc8f093b6530eabba77c9aae9bda70d Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 9 Jan 2025 13:18:37 +0200 Subject: [PATCH 25/34] sudo apt!! --- .github/workflows/bullmq-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index e50ace39b2f2..5bf47969e9df 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -30,7 +30,7 @@ jobs: wget https://unofficial-builds.nodejs.org/download/release/v22.12.0/node-v22.12.0-linux-x64-glibc-217.tar.xz tar -xf node-v22.12.0-linux-x64-glibc-217.tar.xz sudo cp -r node-v22.12.0-linux-x64-glibc-217/* /usr/local/ - apt install yarn jq + sudo apt install yarn jq node --version npm --version yarn --version From 7e63e3f56a420157622c92ad6501ba7b9b7c7704 Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 9 Jan 2025 13:28:06 +0200 Subject: [PATCH 26/34] bullmq release --- .github/workflows/bullmq-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 5bf47969e9df..f7f4c1bc5087 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -50,10 +50,10 @@ jobs: cd $GITHUB_WORKSPACE/../bullmq DOWNLOAD_URL=$(curl -s https://api.github.com/repos/taskforcesh/bullmq/releases/latest | jq -r '.tarball_url') echo "Downloading latest BullMQ release from ${DOWNLOAD_URL}" - #wget -O bullmq.tar.gz ${DOWNLOAD_URL} - #tar -zxvf bullmq.tar.gz - #mv taskforcesh-bullmq-* bullmq - git clone https://github.com/taskforcesh/bullmq + wget -O bullmq.tar.gz ${DOWNLOAD_URL} + tar -zxvf bullmq.tar.gz + mv taskforcesh-bullmq-* bullmq + #git clone https://github.com/taskforcesh/bullmq cd bullmq pwd patch -p1 -f < $GITHUB_WORKSPACE/bullmq.patch From b71755557f484085dc5737ced43e095239a40357 Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 9 Jan 2025 14:26:39 +0200 Subject: [PATCH 27/34] docker --- .github/workflows/bullmq-tests.yml | 31 +++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index f7f4c1bc5087..64a2eff69a4f 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -21,13 +21,22 @@ jobs: #env: # node-version: lts/* + services: + dragonflydb: + image: docker.dragonflydb.io/dragonflydb/dragonfly:v1.24.0 + env: + DFLY_cluster_mode: emulated + DFLY_lock_on_hashtags: true + HEALTHCHECK_PORT: 6379 + ports: + - 6379:6379 steps: - uses: actions/checkout@v4 with: submodules: true - name: Install NodeJs run: | - wget https://unofficial-builds.nodejs.org/download/release/v22.12.0/node-v22.12.0-linux-x64-glibc-217.tar.xz + wget -q https://unofficial-builds.nodejs.org/download/release/v22.12.0/node-v22.12.0-linux-x64-glibc-217.tar.xz tar -xf node-v22.12.0-linux-x64-glibc-217.tar.xz sudo cp -r node-v22.12.0-linux-x64-glibc-217/* /usr/local/ sudo apt install yarn jq @@ -35,22 +44,22 @@ jobs: npm --version yarn --version mkdir -p $GITHUB_WORKSPACE/build - - name: Configure/Build - run: | - cd $GITHUB_WORKSPACE/build - #cmake .. -DCMAKE_BUILD_TYPE=Release -GNinja - #ninja dragonfly - wget https://github.com/dragonflydb/dragonfly/releases/download/v1.24.0/dragonfly-x86_64.tar.gz - tar -zxvf dragonfly-x86_64.tar.gz - mv dragonfly-x86_64 dragonfly - ./dragonfly --alsologtostderr --cluster_mode=emulated --lock_on_hashtags --dbfilename= & +# - name: Configure/Build +# run: | +# cd $GITHUB_WORKSPACE/build +# #cmake .. -DCMAKE_BUILD_TYPE=Release -GNinja +# #ninja dragonfly +# wget -q https://github.com/dragonflydb/dragonfly/releases/download/v1.24.0/dragonfly-x86_64.tar.gz +# tar -zxvf dragonfly-x86_64.tar.gz +# mv dragonfly-x86_64 dragonfly +# ./dragonfly --alsologtostderr --cluster_mode=emulated --lock_on_hashtags --dbfilename= & - name: Build and Test BullMQ run: | mkdir -p $GITHUB_WORKSPACE/../bullmq cd $GITHUB_WORKSPACE/../bullmq DOWNLOAD_URL=$(curl -s https://api.github.com/repos/taskforcesh/bullmq/releases/latest | jq -r '.tarball_url') echo "Downloading latest BullMQ release from ${DOWNLOAD_URL}" - wget -O bullmq.tar.gz ${DOWNLOAD_URL} + wget -q -O bullmq.tar.gz ${DOWNLOAD_URL} tar -zxvf bullmq.tar.gz mv taskforcesh-bullmq-* bullmq #git clone https://github.com/taskforcesh/bullmq From 7ce26bb0948c573e2a47d96747183b8b48a4310e Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 9 Jan 2025 15:14:54 +0200 Subject: [PATCH 28/34] sleep --- .github/workflows/bullmq-tests.yml | 37 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 64a2eff69a4f..9863532bd516 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -21,15 +21,15 @@ jobs: #env: # node-version: lts/* - services: - dragonflydb: - image: docker.dragonflydb.io/dragonflydb/dragonfly:v1.24.0 - env: - DFLY_cluster_mode: emulated - DFLY_lock_on_hashtags: true - HEALTHCHECK_PORT: 6379 - ports: - - 6379:6379 +# services: +# dragonflydb: +# image: docker.dragonflydb.io/dragonflydb/dragonfly:v1.24.0 +# env: +# DFLY_cluster_mode: emulated +# DFLY_lock_on_hashtags: true +# HEALTHCHECK_PORT: 6379 +# ports: +# - 6379:6379 steps: - uses: actions/checkout@v4 with: @@ -44,15 +44,16 @@ jobs: npm --version yarn --version mkdir -p $GITHUB_WORKSPACE/build -# - name: Configure/Build -# run: | -# cd $GITHUB_WORKSPACE/build -# #cmake .. -DCMAKE_BUILD_TYPE=Release -GNinja -# #ninja dragonfly -# wget -q https://github.com/dragonflydb/dragonfly/releases/download/v1.24.0/dragonfly-x86_64.tar.gz -# tar -zxvf dragonfly-x86_64.tar.gz -# mv dragonfly-x86_64 dragonfly -# ./dragonfly --alsologtostderr --cluster_mode=emulated --lock_on_hashtags --dbfilename= & + - name: Configure/Build + run: | + cd $GITHUB_WORKSPACE/build + #cmake .. -DCMAKE_BUILD_TYPE=Release -GNinja + #ninja dragonfly + wget -q https://github.com/dragonflydb/dragonfly/releases/download/v1.24.0/dragonfly-x86_64.tar.gz + tar -zxvf dragonfly-x86_64.tar.gz + mv dragonfly-x86_64 dragonfly + ./dragonfly --alsologtostderr --cluster_mode=emulated --lock_on_hashtags --dbfilename= & + sleep 30 - name: Build and Test BullMQ run: | mkdir -p $GITHUB_WORKSPACE/../bullmq From 906131edfb6ec8ba4811f65c0bbae9e42193d44a Mon Sep 17 00:00:00 2001 From: shahar Date: Thu, 9 Jan 2025 22:32:00 +0200 Subject: [PATCH 29/34] docker weekly --- .github/workflows/bullmq-tests.yml | 37 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 9863532bd516..32c1adc86e00 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -21,15 +21,15 @@ jobs: #env: # node-version: lts/* -# services: -# dragonflydb: -# image: docker.dragonflydb.io/dragonflydb/dragonfly:v1.24.0 -# env: -# DFLY_cluster_mode: emulated -# DFLY_lock_on_hashtags: true -# HEALTHCHECK_PORT: 6379 -# ports: -# - 6379:6379 + services: + dragonflydb: + image: ghcr.io/dragonflydb/dragonfly-weekly:latest + env: + DFLY_cluster_mode: emulated + DFLY_lock_on_hashtags: true + HEALTHCHECK_PORT: 6379 + ports: + - 6379:6379 steps: - uses: actions/checkout@v4 with: @@ -44,16 +44,15 @@ jobs: npm --version yarn --version mkdir -p $GITHUB_WORKSPACE/build - - name: Configure/Build - run: | - cd $GITHUB_WORKSPACE/build - #cmake .. -DCMAKE_BUILD_TYPE=Release -GNinja - #ninja dragonfly - wget -q https://github.com/dragonflydb/dragonfly/releases/download/v1.24.0/dragonfly-x86_64.tar.gz - tar -zxvf dragonfly-x86_64.tar.gz - mv dragonfly-x86_64 dragonfly - ./dragonfly --alsologtostderr --cluster_mode=emulated --lock_on_hashtags --dbfilename= & - sleep 30 +# - name: Configure/Build +# run: | +# cd $GITHUB_WORKSPACE/build +# #cmake .. -DCMAKE_BUILD_TYPE=Release -GNinja +# #ninja dragonfly +# wget -q https://github.com/dragonflydb/dragonfly/releases/download/v1.24.0/dragonfly-x86_64.tar.gz +# tar -zxvf dragonfly-x86_64.tar.gz +# mv dragonfly-x86_64 dragonfly +# ./dragonfly --alsologtostderr --cluster_mode=emulated --lock_on_hashtags --dbfilename= & - name: Build and Test BullMQ run: | mkdir -p $GITHUB_WORKSPACE/../bullmq From 30ab5699d20a8dcea85dd70eb8cdf294a5d8ac4b Mon Sep 17 00:00:00 2001 From: shahar Date: Sun, 12 Jan 2025 11:30:21 +0200 Subject: [PATCH 30/34] v1.24 --- .github/workflows/bullmq-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 32c1adc86e00..8fe8c7ea7378 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -23,7 +23,8 @@ jobs: services: dragonflydb: - image: ghcr.io/dragonflydb/dragonfly-weekly:latest + #image: ghcr.io/dragonflydb/dragonfly-weekly:latest + image: docker.dragonflydb.io/dragonflydb/dragonfly:v1.24.0 env: DFLY_cluster_mode: emulated DFLY_lock_on_hashtags: true From d1c87ea13829ea6a4f47634a817528cd3cfc9d20 Mon Sep 17 00:00:00 2001 From: shahar Date: Sun, 12 Jan 2025 16:29:59 +0200 Subject: [PATCH 31/34] no patch --- .github/workflows/bullmq-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 8fe8c7ea7378..d412030534c0 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -61,12 +61,12 @@ jobs: DOWNLOAD_URL=$(curl -s https://api.github.com/repos/taskforcesh/bullmq/releases/latest | jq -r '.tarball_url') echo "Downloading latest BullMQ release from ${DOWNLOAD_URL}" wget -q -O bullmq.tar.gz ${DOWNLOAD_URL} - tar -zxvf bullmq.tar.gz + tar -zxf bullmq.tar.gz mv taskforcesh-bullmq-* bullmq #git clone https://github.com/taskforcesh/bullmq cd bullmq pwd - patch -p1 -f < $GITHUB_WORKSPACE/bullmq.patch + #patch -p1 -f < $GITHUB_WORKSPACE/bullmq.patch yarn install yarn build BULLMQ_TEST_PREFIX={b} yarn test From 39b8c380789aedb1b1f34cdcc7bcd7d60c1163da Mon Sep 17 00:00:00 2001 From: shahar Date: Sun, 26 Jan 2025 20:56:25 +0200 Subject: [PATCH 32/34] TEST FIX --- .github/workflows/bullmq-tests.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index d412030534c0..4e47c08ff5d5 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -58,18 +58,22 @@ jobs: run: | mkdir -p $GITHUB_WORKSPACE/../bullmq cd $GITHUB_WORKSPACE/../bullmq - DOWNLOAD_URL=$(curl -s https://api.github.com/repos/taskforcesh/bullmq/releases/latest | jq -r '.tarball_url') - echo "Downloading latest BullMQ release from ${DOWNLOAD_URL}" - wget -q -O bullmq.tar.gz ${DOWNLOAD_URL} - tar -zxf bullmq.tar.gz - mv taskforcesh-bullmq-* bullmq - #git clone https://github.com/taskforcesh/bullmq + #DOWNLOAD_URL=$(curl -s https://api.github.com/repos/taskforcesh/bullmq/releases/latest | jq -r '.tarball_url') + #echo "Downloading latest BullMQ release from ${DOWNLOAD_URL}" + #wget -q -O bullmq.tar.gz ${DOWNLOAD_URL} + #tar -zxf bullmq.tar.gz + #mv taskforcesh-bullmq-* bullmq + git clone https://github.com/taskforcesh/bullmq cd bullmq pwd #patch -p1 -f < $GITHUB_WORKSPACE/bullmq.patch yarn install yarn build - BULLMQ_TEST_PREFIX={b} yarn test + #BULLMQ_TEST_PREFIX={b} yarn test + for i in {1..100}; do + BULLMQ_TEST_PREFIX={b} yarn test -g "should keep workers busy"; + redis-cli info Commandstats + done - name: Upload logs on failure if: failure() uses: actions/upload-artifact@v4 From 2972665d5da2dedc7bc678f62c9d0ad415215607 Mon Sep 17 00:00:00 2001 From: shahar Date: Sun, 26 Jan 2025 21:05:18 +0200 Subject: [PATCH 33/34] timeout --- .github/workflows/bullmq-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index 4e47c08ff5d5..f617f5a6bd4c 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -70,6 +70,7 @@ jobs: yarn install yarn build #BULLMQ_TEST_PREFIX={b} yarn test + sed -i 's/timeout: 4000/timeout: 10000/' .mocharc.js for i in {1..100}; do BULLMQ_TEST_PREFIX={b} yarn test -g "should keep workers busy"; redis-cli info Commandstats From 2af98afb18be95d3c169b76d231eb746ddbf6d25 Mon Sep 17 00:00:00 2001 From: shahar Date: Sun, 26 Jan 2025 21:08:37 +0200 Subject: [PATCH 34/34] no redis-cli --- .github/workflows/bullmq-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/bullmq-tests.yml b/.github/workflows/bullmq-tests.yml index f617f5a6bd4c..7b3fa51db5e1 100644 --- a/.github/workflows/bullmq-tests.yml +++ b/.github/workflows/bullmq-tests.yml @@ -73,7 +73,6 @@ jobs: sed -i 's/timeout: 4000/timeout: 10000/' .mocharc.js for i in {1..100}; do BULLMQ_TEST_PREFIX={b} yarn test -g "should keep workers busy"; - redis-cli info Commandstats done - name: Upload logs on failure if: failure()