diff --git a/.github/workflows/new-issues-to-triage.yml b/.github/workflows/new-issues-to-triage.yml deleted file mode 100644 index 6750bb29..00000000 --- a/.github/workflows/new-issues-to-triage.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: New Issues to Triage - -on: - issues: - types: [opened] - -jobs: - new-issue-to-triage: - runs-on: ubuntu-latest - name: New Issue to Triage - # Based on https://docs.github.com/en/issues/trying-out-the-new-projects-experience/automating-projects#example-workflow-authenticating-with-a-personal-access-token - steps: - - name: Get project data - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - ORGANIZATION: pulumi - PROJECT_NUMBER: 33 - run: | - gh api graphql -f query=' - query($org: String!, $number: Int!) { - organization(login: $org){ - projectNext(number: $number) { - id - fields(first:20) { - nodes { - id - name - settings - } - } - } - } - }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json - echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV - echo 'DATE_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Date posted") | .id' project_data.json) >> $GITHUB_ENV - echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV - echo 'TODO_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Todo") |.id' project_data.json) >> $GITHUB_ENV - - name: Add issue to project - env: - GITHUB_TOKEN: ${{ secrets.TRIAGE_WORKFLOW_TOKEN }} - ISSUE_ID: ${{ github.event.issue.node_id }} - run: | - item_id="$( gh api graphql -f query=' - mutation($project:ID!, $pr:ID!) { - addProjectNextItem(input: {projectId: $project, contentId: $pr}) { - projectNextItem { - id - } - } - }' -f project=$PROJECT_ID -f pr=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')" - - echo 'ITEM_ID='$item_id >> $GITHUB_ENV diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 57c47a70..54535d25 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -100,7 +100,7 @@ jobs: - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 with: - args: -p 1 release --clean --timeout 90m0s + args: -p 1 release --clean --timeout 90m0s --release-notes=CHANGELOG_PENDING.md version: latest strategy: fail-fast: true diff --git a/.gitignore b/.gitignore index c806c7cf..647f626d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /vendor/ **/bin/ +**/venv/ **/obj/ **/node_modules/ **/.vs @@ -17,6 +18,4 @@ ci-scripts **/version.txt .mono /go/ -*.sln -dist -pulumi_pulumiservice.egg-info \ No newline at end of file +*.sln \ No newline at end of file diff --git a/Makefile b/Makefile index bd7b18ab..24536f0a 100644 --- a/Makefile +++ b/Makefile @@ -70,15 +70,15 @@ python_sdk: gen_sdk_prerequisites rm -rf sdk/python $(PULUMI) package gen-sdk $(SCHEMA_FILE) --language python cp README.md ${PACKDIR}/python/ - sudo python3 -m venv temp-venv - sudo temp-venv/bin/pip install setuptools - temp-venv/bin/python3 ${PACKDIR}/python/setup.py clean --all - rm -rf ${PACKDIR}/python/bin ${PACKDIR}/python.bin/ - cp -R ${PACKDIR}/python ${PACKDIR}/python.bin && mv ${PACKDIR}/python.bin ${PACKDIR}/python/bin - sed -i.bak -e 's/^VERSION = .*/VERSION = "$(PYPI_VERSION)"/g' -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "$(VERSION)"/g' ${PACKDIR}/python/bin/setup.py - rm ${PACKDIR}/python/bin/setup.py.bak - temp-venv/bin/python3 ${PACKDIR}/python/bin/setup.py build sdist - sudo rm -rf temp-venv + cd ${PACKDIR}/python/ && \ + python3 -m venv venv && \ + . ./venv/bin/activate && \ + python -m pip install setuptools && \ + python setup.py clean --all && \ + rm -rf ./bin/ ../python.bin/ && cp -R . ../python.bin && mv ../python.bin ./bin && \ + sed -i.bak -e 's/^VERSION = .*/VERSION = "$(PYPI_VERSION)"/g' -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "$(VERSION)"/g' ./bin/setup.py && \ + rm ./bin/setup.py.bak && \ + cd ./bin && python3 setup.py build sdist GRADLE_DIR := $(WORKING_DIR)/.gradle GRADLE := $(GRADLE_DIR)/gradlew