From 981cd0456db9aa80af371681c84a440c244f5629 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 12:04:59 +0200 Subject: [PATCH 1/7] fix: needs succes all test before pushing to pypi prelease Signed-off-by: samsja --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 0984bd586ef..bd88a1be4b5 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -8,7 +8,7 @@ on: jobs: prerelease: - needs: [docarray-test, docarray-oldproto-test] + needs: [success-all-test] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.5.0 From 3a5bf15225060d7abc94f9bb6d4d90bc617409ab Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 12:07:12 +0200 Subject: [PATCH 2/7] chore: test on this branch Signed-off-by: samsja --- .github/workflows/cd.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index bd88a1be4b5..56d031d5310 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -3,7 +3,8 @@ name: CD on: push: branches: - - main + - chore-add-prerelease + #- main jobs: From aafd678bc7fb6cae403c0390418bdb3214ccfa0f Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 12:11:00 +0200 Subject: [PATCH 3/7] chore: test on this branch Signed-off-by: samsja --- .github/workflows/cd.yml | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 56d031d5310..6418c590810 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -8,22 +8,22 @@ on: jobs: - prerelease: - needs: [success-all-test] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2.5.0 - with: - fetch-depth: 100 - - name: Pre-release (.devN) - run: | - git fetch --depth=1 origin +refs/tags/*:refs/tags/* - pip install twine wheel - ./scripts/release.sh - env: - TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }} - TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} - JINA_SLACK_WEBHOOK: ${{ secrets.JINA_SLACK_WEBHOOK }} +# prerelease: +# needs: [success-all-test] +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2.5.0 +# with: +# fetch-depth: 100 +# - name: Pre-release (.devN) +# run: | +# git fetch --depth=1 origin +refs/tags/*:refs/tags/* +# pip install twine wheel +# ./scripts/release.sh +# env: +# TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }} +# TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} +# JINA_SLACK_WEBHOOK: ${{ secrets.JINA_SLACK_WEBHOOK }} check-readme-modification: runs-on: ubuntu-latest @@ -47,8 +47,8 @@ jobs: run: | echo "readme_changed=true" >> $GITHUB_OUTPUT - publish-docarray-org: - needs: check-readme-modification - if: needs.check-readme-modification.outputs.readme_changed == 'true' - uses: ./.github/workflows/publish-docarray-org.yml - secrets: inherit \ No newline at end of file +# publish-docarray-org: +# needs: check-readme-modification +# if: needs.check-readme-modification.outputs.readme_changed == 'true' +# uses: ./.github/workflows/publish-docarray-org.yml +# secrets: inherit \ No newline at end of file From 1d801f1aafcb363284712d03258544a557948122 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 12:29:52 +0200 Subject: [PATCH 4/7] chore: test on this branch Signed-off-by: samsja --- .github/workflows/cd.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 6418c590810..5e03ddaeb9e 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -8,15 +8,15 @@ on: jobs: -# prerelease: -# needs: [success-all-test] -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2.5.0 -# with: -# fetch-depth: 100 -# - name: Pre-release (.devN) -# run: | + prerelease: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.5.0 + with: + fetch-depth: 100 + - name: Pre-release (.devN) + run: | + echo "hello" # git fetch --depth=1 origin +refs/tags/*:refs/tags/* # pip install twine wheel # ./scripts/release.sh From 54c32aa95c9e6a8bcba7f91d665f4b8a378c6d92 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 12:45:34 +0200 Subject: [PATCH 5/7] chore: use reusable workflow Signed-off-by: samsja --- .github/workflows/cd.yml | 3 +++ .github/workflows/ci.yml | 15 +++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 5e03ddaeb9e..27029cc61e4 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -8,7 +8,10 @@ on: jobs: + success-all-test: + uses: ./.github/workflows/ci.yml prerelease: + needs: [success-all-test] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.5.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a36fdc0dcb..bba9fe9b69c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,12 +1,15 @@ name: CI on: - push: - branches: - - main - - feat-rewrite-v2 - pull_request: - types: [opened, synchronize, reopened] + workflow_call: + inputs: + config-path: + type: string +# pull_request: +# types: [opened, synchronize, reopened] + + + jobs: lint-ruff: From 7aac5d58b601e2a1a4f2f4ee133d79309eb813a5 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 12:56:36 +0200 Subject: [PATCH 6/7] chore: do actual pre release Signed-off-by: samsja --- .github/workflows/cd.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 27029cc61e4..9380c9a9ebf 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -20,13 +20,13 @@ jobs: - name: Pre-release (.devN) run: | echo "hello" -# git fetch --depth=1 origin +refs/tags/*:refs/tags/* -# pip install twine wheel -# ./scripts/release.sh -# env: -# TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }} -# TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} -# JINA_SLACK_WEBHOOK: ${{ secrets.JINA_SLACK_WEBHOOK }} + git fetch --depth=1 origin +refs/tags/*:refs/tags/* + pip install twine wheel + ./scripts/release.sh + env: + TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }} + TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} + JINA_SLACK_WEBHOOK: ${{ secrets.JINA_SLACK_WEBHOOK }} check-readme-modification: runs-on: ubuntu-latest From 7bd984321a7ce80db002c84c3f7f97ec4e853f76 Mon Sep 17 00:00:00 2001 From: samsja Date: Mon, 17 Apr 2023 13:02:24 +0200 Subject: [PATCH 7/7] chore: make compatible with main branch Signed-off-by: samsja --- .github/workflows/cd.yml | 4 +--- .github/workflows/ci.yml | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 9380c9a9ebf..35812a4c239 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -3,9 +3,7 @@ name: CD on: push: branches: - - chore-add-prerelease - #- main - + - main jobs: success-all-test: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bba9fe9b69c..50bd5ed2b85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,9 +5,8 @@ on: inputs: config-path: type: string -# pull_request: -# types: [opened, synchronize, reopened] - + pull_request: + types: [opened, synchronize, reopened] jobs: