From 527f23095077cbab3f27f8e37763990c9b885064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Tue, 1 Oct 2024 09:08:32 +0200 Subject: [PATCH 1/3] docs: fix author domain name --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 35c973e5..e9d38709 100644 --- a/setup.py +++ b/setup.py @@ -24,8 +24,8 @@ "Community": "https://discuss.openedx.org", }, license="AGPLv3", - author="Overhang.IO", - author_email="contact@overhang.io", + author="Edly", + author_email="hello@edly.io", maintainer="Edly", maintainer_email="faraz.maqsood@arbisoft.com", description="A Tutor plugin for Open edX E-Commerce", From 4193b67ef00397a654b962f9319ad9ad06d118e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Thu, 3 Oct 2024 11:16:24 +0200 Subject: [PATCH 2/3] ci: upgrade vendor actions --- .github/workflows/auto-add-to-project.yml | 2 +- .github/workflows/sync.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/auto-add-to-project.yml b/.github/workflows/auto-add-to-project.yml index 7dadeb66..af1f3519 100644 --- a/.github/workflows/auto-add-to-project.yml +++ b/.github/workflows/auto-add-to-project.yml @@ -11,7 +11,7 @@ jobs: name: Add issue and bugs to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v0.5.0 + - uses: actions/add-to-project@v1.0.2 with: project-url: https://github.com/orgs/overhangio/projects/4 github-token: ${{ secrets.GH_PROJECT_PERSONAL_ACCESS_TOKEN }} diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index f7a09d21..6791bfac 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -8,7 +8,7 @@ jobs: sync: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Add remote diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5671b62f..e75a219a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: matrix: python-version: ['3.8', '3.12'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v5 with: From 057b1bac7f6544b260db9fed58212c3688fb86af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Fri, 21 Jun 2024 17:54:19 +0200 Subject: [PATCH 3/3] fix: Docker image build Image was missing the pkg-config package, probably due to a recent upgrade of the mysql python package in the upstream ecommerce repo. --- changelog.d/20240621_175315_regis_nightly.md | 1 + tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/20240621_175315_regis_nightly.md diff --git a/changelog.d/20240621_175315_regis_nightly.md b/changelog.d/20240621_175315_regis_nightly.md new file mode 100644 index 00000000..e977836a --- /dev/null +++ b/changelog.d/20240621_175315_regis_nightly.md @@ -0,0 +1 @@ +- [Bugfix] Fix ecommerce image build, which was failing because of a missing pkg-config apt package. (by @regisb) diff --git a/tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile b/tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile index 32c1abd7..7304ff7c 100644 --- a/tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile +++ b/tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile @@ -33,7 +33,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ apt update && \ apt install -y libmysqlclient-dev libssl-dev build-essential \ - libsqlite3-dev libffi-dev mime-support + libsqlite3-dev libffi-dev mime-support pkg-config ARG APP_USER_ID=1000 RUN if [ "$APP_USER_ID" = 0 ]; then echo "app user may not be root" && false; fi