Skip to content

🕷️ The BEST Web Scraping framework that handles everything from a single request to a full-scale crawl! Don't be shy, join here: https://discord.gg/EMgGbDceNQ and follow here for daily tips and tricks: https://x.com/Scrapling_dev

ops: combine the auto-release/publish workflows

Karim shoairf8fbd4b0e0dd
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index 4e94941..0000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Publish Python 🐍 distributions 📦 to PyPI
-
-on:
- release:
- types: [created,published]
-
-jobs:
- build-n-publish:
- name: Build and publish Python 🐍 distributions 📦 to PyPI
- runs-on: ubuntu-latest
- environment:
- name: PyPI
- url: https://pypi.org/p/scrapling
- permissions:
- id-token: write
- steps:
- - uses: actions/checkout@v4
- - name: Set up Python
- uses: actions/setup-python@v5
- with:
- python-version: 3.12
-
- - name: Upgrade pip
- run: python3 -m pip install --upgrade pip
-
- - name: Install build
- run: python3 -m pip install --upgrade build twine setuptools
-
- - name: Build a binary wheel and a source tarball
- run: python3 -m build --sdist --wheel --outdir dist/
-
- - name: Publish distribution 📦 to PyPI
- uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.github/workflows/auto-release.yml b/.github/workflows/release-and-publish.yml
similarity index 62%
rename from .github/workflows/auto-release.yml
rename to .github/workflows/release-and-publish.yml
index 372a960..81705b4 100644
--- a/.github/workflows/auto-release.yml
+++ b/.github/workflows/release-and-publish.yml
@@ -1,5 +1,5 @@
-name: Create Release
-# Creates a GitHub release when a PR is merged to main, using the PR title as the version (must start with 'v') and PR body as release notes.
+name: Create Release and Publish to PyPI
+# Creates a GitHub release when a PR is merged to main (using PR title as version and body as release notes), then publishes to PyPI.
on:
pull_request:
@@ -8,11 +8,15 @@ on:
- main
jobs:
- create-release:
+ create-release-and-publish:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
+ environment:
+ name: PyPI
+ url: https://pypi.org/p/scrapling
permissions:
contents: write
+ id-token: write
steps:
- uses: actions/checkout@v4
with:
@@ -50,4 +54,21 @@ jobs:
draft: false
prerelease: false
env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Set up Python
+ uses: actions/setup-python@v5
+ with:
+ python-version: 3.12
+
+ - name: Upgrade pip
+ run: python3 -m pip install --upgrade pip
+
+ - name: Install build
+ run: python3 -m pip install --upgrade build twine setuptools
+
+ - name: Build a binary wheel and a source tarball
+ run: python3 -m build --sdist --wheel --outdir dist/
+
+ - name: Publish distribution 📦 to PyPI
+ uses: pypa/gh-action-pypi-publish@release/v1
\ No newline at end of file