diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bdd3b8b5..c28b1b57 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,7 +53,7 @@ jobs: run: | PR=$(echo "$GITHUB_REF" | awk -F / '{print $3}') echo "$PR" - echo ::set-output name=pr_number::pr-"$PR" + echo "pr_number=pr-$PR" >> $GITHUB_OUTPUT # Build the Docker image - name: Build Docker Image if: github.ref != 'refs/heads/main' @@ -71,7 +71,7 @@ jobs: id: vars run: | git fetch --tags - echo ::set-output name=tag::$(git describe --tags --abbrev=0) + echo "tag=$(git describe --tags --abbrev=0)" >> $GITHUB_OUTPUT - name: update versions if: github.ref != 'refs/heads/main' env: @@ -130,7 +130,7 @@ jobs: id: release shell: bash run: | - echo ::set-output name=version::$(grep -E "appVersion:\s+" $CHART_DIRECTORY/Chart.yaml | cut -d" " -f2 | sed -r 's/"//g') + echo "version=$(grep -E "appVersion:\s+" $CHART_DIRECTORY/Chart.yaml | cut -d" " -f2 | sed -r 's/"//g')" >> $GITHUB_OUTPUT - name: package helm run: | diff --git a/Makefile b/Makefile index 6e17ebaf..53c0b3fe 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ build-kubernetes: docker build -f _infra/docker/Dockerfile . lint: - pipenv check ./application ./tests -i 51457 + pipenv check ./application ./tests -i 51457 -i 51668 pipenv run isort . pipenv run black --line-length 120 . pipenv run flake8 ./application ./tests diff --git a/_infra/helm/collection-instrument/Chart.yaml b/_infra/helm/collection-instrument/Chart.yaml index a4c51e07..963a36da 100644 --- a/_infra/helm/collection-instrument/Chart.yaml +++ b/_infra/helm/collection-instrument/Chart.yaml @@ -14,8 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 3.0.6 +version: 3.0.7 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 3.0.6 +appVersion: 3.0.7