Skip to content

Commit

Permalink
Housekeeping: remove stale wf, fix python sdk gen, add goreleaser flag (
Browse files Browse the repository at this point in the history
#432)

### Summary
- Remove `new-issues-to-triage` workflow, as requested by Cleve
[here](https://pulumi.slack.com/archives/C8A7QG1CZ/p1729884055214459?thread_ts=1729883581.385159&cid=C8A7QG1CZ)
- Fix the python sdk Makefile command - last PR didn't fix all the way
and used `sudo` (thanks for the help @seanyeh!)
- Add `--release-notes=CHANGELOG_PENDING.md` to include changelog text
in the release description (to be tested after this is in)
  • Loading branch information
IaroslavTitov authored Oct 30, 2024
1 parent a28c8e4 commit fe85964
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 65 deletions.
52 changes: 0 additions & 52 deletions .github/workflows/new-issues-to-triage.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/vendor/
**/bin/
**/venv/
**/obj/
**/node_modules/
**/.vs
Expand All @@ -17,6 +18,4 @@ ci-scripts
**/version.txt
.mono
/go/
*.sln
dist
pulumi_pulumiservice.egg-info
*.sln
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fe85964

Please sign in to comment.