From b8e7341569039ec3c37bfba51d910c988209d81b Mon Sep 17 00:00:00 2001 From: Viktor Delev Date: Wed, 8 May 2024 12:24:26 +0200 Subject: [PATCH] clean up --- .github/actions/build-python/action.yml | 26 ++++++------------------- .github/workflows/build-node-python.yml | 2 -- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/.github/actions/build-python/action.yml b/.github/actions/build-python/action.yml index 46d694b1..0d97165a 100644 --- a/.github/actions/build-python/action.yml +++ b/.github/actions/build-python/action.yml @@ -20,25 +20,16 @@ inputs: run_build: default: true required: false - disable_cache: - description: "Set to true to disable caching" - default: false - required: false runs: using: "composite" steps: - - name: Set up python (with cache) - uses: actions/setup-python@v5 + - name: Set up python + uses: actions/setup-python@v3 with: python-version: ${{ inputs.python_version }} cache: 'pip' # needs wheel for make - #- name: Set up python (without cache) - # if: inputs.disable_cache == 'true' - # uses: actions/setup-python@v3 - # with: - # python-version: ${{ inputs.python_version }} - name: install additional requirements run: | pip install setuptools wheel @@ -55,25 +46,20 @@ runs: env: GITHUB_TOKEN: ${{ inputs.github_ro_token }} - name: Install python dependencies - run: | - pip install --upgrade pip setuptools wheel - make develop + run: make develop shell: bash - name: Show installed pip packages run: pip list || true shell: bash - name: Linting if: inputs.run_lint == 'true' - run: | - make lint check-format + run: make lint check-format shell: bash - name: Run tests if: inputs.run_test == 'true' - run: | - make test + run: make test shell: bash - name: Build wheel if: inputs.run_build == 'true' - run: | - make build + run: make build shell: bash diff --git a/.github/workflows/build-node-python.yml b/.github/workflows/build-node-python.yml index df2edc89..32ebf47a 100644 --- a/.github/workflows/build-node-python.yml +++ b/.github/workflows/build-node-python.yml @@ -209,7 +209,6 @@ jobs: if: env.GH_ACTIONS_SELF_HOSTED_NETWORK_NAME != '' run: | { - #echo "GITHUB_TOKEN=${{ secrets.DATAVISYN_BOT_REPO_TOKEN }}" echo "POSTGRES_HOSTNAME=postgres_${{ github.job }}_${{ inputs.deduplication-id }}_${{ github.run_id }}_${{ github.run_attempt }}" echo "POSTGRES_PORT=5432" } >> "$GITHUB_ENV" @@ -332,7 +331,6 @@ jobs: if: env.GH_ACTIONS_SELF_HOSTED_NETWORK_NAME != '' run: | { - echo "GITHUB_TOKEN=${{ secrets.DATAVISYN_BOT_REPO_TOKEN }}" echo "POSTGRES_HOSTNAME=postgres_${{ github.job }}_${{ inputs.deduplication-id }}_${{ github.run_id }}_${{ github.run_attempt }}" echo "POSTGRES_PORT=5432" } >> "$GITHUB_ENV"