From 2197650f1ec66d2da5867386ef0499e904a23b23 Mon Sep 17 00:00:00 2001 From: David Yang Date: Tue, 7 Jan 2025 13:37:49 +0800 Subject: [PATCH] Adjust CI dependency installs and parameters --- .github/workflows/ci.yml | 6 +++--- .github/workflows/release.yml | 7 +++---- scripts/bootstrap-dev-debian.sh | 7 +++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 51667626e..e233de75d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,6 @@ jobs: sudo apt update -q yes | sudo ./scripts/bootstrap-dev-debian.sh ./scripts/bootstrap-dev-pip.sh system - #sudo apt install --no-install-recommends -y xvfb gir1.2-gtk-3.0 python3-gi python3-gi-cairo gir1.2-wnck-3.0 gobject-introspection libgirepository1.0-dev export DISPLAY=:99.0 @@ -87,6 +86,7 @@ jobs: - name: Publish distribution 📦 to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: - verify_metadata: false + verify-metadata: false + verbose: true password: ${{ secrets.TEST_PYPI_API_TOKEN }} - repository_url: https://test.pypi.org/legacy/ + repository-url: https://test.pypi.org/legacy/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2d97e20f1..96e640b01 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,6 @@ jobs: sudo apt update -q yes | sudo ./scripts/bootstrap-dev-debian.sh ./scripts/bootstrap-dev-pip.sh system - #sudo apt install --no-install-recommends -y xvfb gir1.2-gtk-3.0 python3-gi python3-gi-cairo gir1.2-wnck-3.0 gobject-introspection libgirepository1.0-dev export DISPLAY=:99.0 @@ -70,13 +69,13 @@ jobs: - name: Publish distribution 📦 to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: - verify_metadata: false + verify-metadata: false password: ${{ secrets.TEST_PYPI_API_TOKEN }} - repository_url: https://test.pypi.org/legacy/ + repository-url: https://test.pypi.org/legacy/ - name: Publish distribution 📦 to PyPI if: startsWith(github.ref, 'refs/tags') uses: pypa/gh-action-pypi-publish@release/v1 with: - verify_metadata: false + verify-metadata: false password: ${{ secrets.PYPI_API_TOKEN }} diff --git a/scripts/bootstrap-dev-debian.sh b/scripts/bootstrap-dev-debian.sh index 31a4a225a..dcb1cd8d0 100755 --- a/scripts/bootstrap-dev-debian.sh +++ b/scripts/bootstrap-dev-debian.sh @@ -44,13 +44,16 @@ if [[ $RUN == "1" ]]; then libutempter0 \ python3 \ python3-cairo \ + python3-dev \ python3-dbus \ python3-gi \ python3-setuptools-scm \ python3-pip \ - libgirepository1.0-dev + libgirepository1.0-dev \ + libcairo2-dev \ + pkg-config fi - + if [[ $MAKE == "1" ]]; then echo "Install packages needed for making guake" sudo apt-get install --no-install-recommends -y \