diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index 5c2d6b7..f7a9d7c 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -8,12 +8,7 @@ on: required: true jobs: - code-quality: - uses: ./.github/workflows/run-tests.yml - secrets: inherit - tag: - needs: code-quality uses: singnet/das/.github/workflows/run-semver.yml@master with: version: ${{ github.event.inputs.version }} @@ -37,6 +32,7 @@ jobs: - name: Update version run: sed -i "s/version=.*/version='${{ github.event.inputs.version }}',/" pyproject.toml + - name: Build (Docker Image) run: ./scripts/docker_image_build.sh diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml deleted file mode 100644 index d2d55d0..0000000 --- a/.github/workflows/run-tests.yml +++ /dev/null @@ -1,67 +0,0 @@ ---- -name: Run Unit & Integration tests - -on: - workflow_call: - - pull_request: - branches: - - master - - workflow_dispatch: - -jobs: - build-wheel: - runs-on: ubuntu-22.04 - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Build Bazel - run: make bazel-build - - - name: Build Wheel - run: make wheel - - - name: Upload das-node-wheel artifact - uses: actions/upload-artifact@v4 - with: - name: das-node-wheel - path: dist/* - - unit-tests-python: - runs-on: ubuntu-22.04 - needs: build-wheel - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: ~3.10 - cache: "pip" - - - name: Download das-node-wheel artifact - uses: actions/download-artifact@v4 - with: - name: das-node-wheel - path: dist - - - name: Installing das-node-wheel - run: pip install $(find . -name *.whl -type f | head -n 1) - - - name: Execute Python Unit Test - run: make test-python - - unit-tests-cpp: - runs-on: ubuntu-22.04 - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Build Bazel - run: make bazel-build - - - name: Execute C++ Unit Test - run: docker run --rm -i das-node-builder make test-cpp diff --git a/scripts/_build_wheel.sh b/scripts/_build_wheel.sh index 2e63f99..2a19f1c 100755 --- a/scripts/_build_wheel.sh +++ b/scripts/_build_wheel.sh @@ -22,7 +22,7 @@ find ${TMP_DEST_DIR} -type f -name "*.whl" \ [ $? -ne 0 ] && exit 1 # Change ownership -chown -R ${_USER}:${_USER} ${DEST_DIR} +chown -R ${_USER}:${_GROUP} ${DEST_DIR} [ $? -ne 0 ] && exit 1 # Clean up diff --git a/scripts/bazel_test.sh b/scripts/bazel_test.sh index 50c0c88..525d54e 100755 --- a/scripts/bazel_test.sh +++ b/scripts/bazel_test.sh @@ -1,7 +1,3 @@ #!/bin/bash -cd src - bazel test --noenable_bzlmod --cache_test_results=no //... - -cd - \ No newline at end of file