Skip to content

Commit

Permalink
Cherry pick to release-3.4 for env (#5639)
Browse files Browse the repository at this point in the history 
* Update requirements.txt (#5512)

Solidified tomli version to solve centos7 compatibility issues

* fixed yapf version  (#5513)

* Update requirements.txt

fixed yapf version to the last version supporting tomli 1.x

* Update requirements.txt

fix typo

* update workflow (#5429)

* Update the referenced workflow and remove the deprecated version

* update release workflow

* Update rc.yml (#5466)

Fix tagnum is not passed into GITHUB_OUTPUT

---------

Co-authored-by: George <58841610+Shinji-IkariG@users.noreply.github.com>
  • Loading branch information
@Sophie-Xie @Shinji-IkariG
Sophie-Xie and Shinji-IkariG committed Jul 14, 2023
1 parent a6dc673 commit e4741db
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 80 deletions.
52 changes: 26 additions & 26 deletions .github/workflows/nightly.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ jobs:
container:
image: vesoft/nebula-dev:${{ matrix.os }}
steps:
- uses: webiny/action-post-run@2.0.1
- uses: webiny/action-post-run@3.0.0
with:
run: sh -c "find . -mindepth 1 -delete"
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: "^1.16.7"
- name: package
Expand All @@ -45,7 +45,7 @@ jobs:
run: |
find pkg-build/cpack_output -type f \( -iname \*.deb -o -iname \*.rpm -o -iname \*.tar.gz \) -exec bash -c "sha256sum {} > {}.sha256sum.txt" \;
subdir=$(date -u +%Y.%m.%d)
echo "::set-output name=subdir::$subdir"
echo "subdir=$subdir" >> $GITHUB_OUTPUT
# - uses: actions/upload-artifact@v1
# with:
# name: ${{ matrix.os }}-nightly
Expand All @@ -64,17 +64,17 @@ jobs:
needs: package
runs-on: [self-hosted, nebula]
steps:
- uses: webiny/action-post-run@2.0.1
- uses: webiny/action-post-run@3.0.0
with:
run: sh -c "find . -mindepth 1 -delete"
- uses: actions/checkout@v2
- uses: docker/login-action@v1
- uses: actions/checkout@v3
- uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- uses: docker/setup-qemu-action@v1
- uses: docker/setup-buildx-action@v1
- uses: docker/build-push-action@v2
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- uses: docker/build-push-action@v4
with:
context: .
file: ./docker/Dockerfile
Expand All @@ -84,7 +84,7 @@ jobs:
target: graphd
cache-to: type=local,dest=/tmp/buildx-cache,mode=max
push: true
- uses: docker/build-push-action@v2
- uses: docker/build-push-action@v4
with:
context: .
file: ./docker/Dockerfile
Expand All @@ -94,7 +94,7 @@ jobs:
target: storaged
cache-from: type=local,src=/tmp/buildx-cache
push: true
- uses: docker/build-push-action@v2
- uses: docker/build-push-action@v4
with:
context: .
file: ./docker/Dockerfile
Expand All @@ -104,7 +104,7 @@ jobs:
target: metad
cache-from: type=local,src=/tmp/buildx-cache
push: true
- uses: docker/build-push-action@v2
- uses: docker/build-push-action@v4
with:
context: .
file: ./docker/Dockerfile
Expand Down Expand Up @@ -137,10 +137,10 @@ jobs:
- /tmp/ccache/nebula/${{ matrix.os }}-${{ matrix.compiler }}:/tmp/ccache/nebula/${{ matrix.os }}-${{ matrix.compiler }}
options: --cap-add=SYS_PTRACE
steps:
- uses: webiny/action-post-run@2.0.1
- uses: webiny/action-post-run@3.0.0
with:
run: sh -c "find . -mindepth 1 -delete"
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Prepare environment
run: |
[ -d build/ ] && rm -rf build/* || mkdir -p build
Expand Down Expand Up @@ -190,12 +190,12 @@ jobs:
- name: coverage
run: |
~/.local/bin/fastcov -d build -l -o fastcov.info -p --exclude /usr/include /usr/lib /opt/vesoft build/ tests/ /test /mock .lex .yy
- uses: codecov/codecov-action@v2
- uses: codecov/codecov-action@v3
with:
files: fastcov.info
fail_ci_if_error: false
- name: Upload logs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ failure() }}
with:
name: ${{ matrix.os }}-${{ matrix.compiler }}-nebula-test-logs
Expand Down Expand Up @@ -234,32 +234,32 @@ jobs:
--health-timeout 5s
--health-retries 10
steps:
- uses: webiny/action-post-run@2.0.1
- uses: webiny/action-post-run@3.0.0
with:
run: sh -c "find . -mindepth 1 -delete"
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: output some vars
id: vars
env:
SHA_EXT: sha256sum.txt
run: |
subdir=$(date -u +%Y.%m.%d)
echo "::set-output name=subdir::$subdir"
echo "subdir=$subdir" >> $GITHUB_OUTPUT
- id: oss_package
run: |
case ${{ matrix.os }} in
ubuntu1804)
echo "::set-output name=p::nebula-graph-${{ steps.vars.outputs.subdir }}-nightly.ubuntu1804.amd64.tar.gz"
echo "p=nebula-graph-${{ steps.vars.outputs.subdir }}-nightly.ubuntu1804.amd64.tar.gz" >> $GITHUB_OUTPUT
;;
ubuntu2004)
echo "::set-output name=p::nebula-graph-${{ steps.vars.outputs.subdir }}-nightly.ubuntu2004.amd64.tar.gz"
echo "p=nebula-graph-${{ steps.vars.outputs.subdir }}-nightly.ubuntu2004.amd64.tar.gz" >> $GITHUB_OUTPUT
;;
centos7)
echo "::set-output name=p::nebula-graph-${{ steps.vars.outputs.subdir }}-nightly.el7.x86_64.tar.gz"
echo "p=nebula-graph-${{ steps.vars.outputs.subdir }}-nightly.el7.x86_64.tar.gz" >> $GITHUB_OUTPUT
;;
centos8)
echo "::set-output name=p::nebula-graph-${{ steps.vars.outputs.subdir }}-nightly.el8.x86_64.tar.gz"
echo "p=nebula-graph-${{ steps.vars.outputs.subdir }}-nightly.el8.x86_64.tar.gz" >> $GITHUB_OUTPUT
;;
esac
- name: Prepare environment
Expand All @@ -270,7 +270,7 @@ jobs:
- name: CMake
id: cmake
run: |
echo "::set-output name=j::8"
echo "j=8" >> $GITHUB_OUTPUT
- name: download from oss
run: |
ossutil64 -e ${{ secrets.OSS_ENDPOINT }} \
Expand Down Expand Up @@ -303,7 +303,7 @@ jobs:
working-directory: tests/
timeout-minutes: 2
- name: Upload logs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ failure() }}
with:
name: ${{ matrix.os }}-${{ matrix.compiler }}-nebula-test-logs
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pull_request.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
if: ${{ contains(github.event.pull_request.labels.*.name, 'ready-for-testing') && github.event.pull_request.merged != true }}
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.base.sha }}
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
clean: false
- name: Check License Header
Expand All @@ -40,7 +40,7 @@ jobs:
run: |
git diff -U0 --no-color ${{ github.event.pull_request.base.sha }} HEAD | /usr/share/clang/clang-format-10/clang-format-diff.py -p1 | tee /tmp/.clang-format-diff
[ -s /tmp/.clang-format-diff ] && exit 1 || true
- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: 3.7
- name: Prepare Gherkin exec environ
Expand Down Expand Up @@ -86,10 +86,10 @@ jobs:
--health-timeout 5s
--health-retries 10
steps:
- uses: webiny/action-post-run@2.0.1
- uses: webiny/action-post-run@3.0.0
with:
run: sh -c "find . -mindepth 1 -delete"
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Prepare environment
id: prepare
run: |
Expand Down Expand Up @@ -221,7 +221,7 @@ jobs:
if: ${{ matrix.compiler == 'gcc-9.3' && matrix.os == 'ubuntu2004' }}
run: |
~/.local/bin/fastcov -d build -l -o fastcov.info -p --exclude /usr/include /usr/lib /opt/vesoft build/ tests/ /test /mock .lex .yy
- uses: codecov/codecov-action@v2
- uses: codecov/codecov-action@v3
if: ${{ matrix.compiler == 'gcc-9.3' && matrix.os == 'ubuntu2004' }}
with:
files: fastcov.info
Expand All @@ -231,7 +231,7 @@ jobs:
run: |
exit $(grep -P "SUMMARY: AddressSanitizer: \d+ byte\(s\) leaked in \d+ allocation\(s\)\." build/server_*/logs/*stderr.log | wc -l)
- name: Upload logs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ failure() }}
with:
name: ${{ matrix.os }}-${{ matrix.compiler }}-nebula-test-logs
Expand Down
Loading

0 comments on commit e4741db

Please sign in to comment.