From 08c6b2261bfcb5b1c369e185a10e550b480f3590 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 3 Jul 2026 09:16:10 +0000 Subject: [PATCH 1/2] Initial plan From 071e8cff0efe02d7e79d2fc15972a1bc21f4326e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 3 Jul 2026 09:18:00 +0000 Subject: [PATCH 2/2] Fix Docker build: clone main branch from PyGEM-Community/PyGEM (was master) --- .github/workflows/docker_pygem.yml | 3 ++- docker/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker_pygem.yml b/.github/workflows/docker_pygem.yml index cfa3a618..53ccb5e5 100644 --- a/.github/workflows/docker_pygem.yml +++ b/.github/workflows/docker_pygem.yml @@ -59,6 +59,7 @@ jobs: no-cache: true file: 'docker/Dockerfile' build-args: | - PYGEM_BRANCH=${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }} + # Map this repo's 'master' branch to 'main' in PyGEM-Community/PyGEM (upstream uses 'main') + PYGEM_BRANCH=${{ github.ref == 'refs/heads/master' && 'main' || 'dev' }} tags: | ghcr.io/pygem-community/pygem:${{ github.ref == 'refs/heads/master' && 'latest' || github.ref == 'refs/heads/dev' && 'dev' }} \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 11b4dd60..ada499cd 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,8 +16,8 @@ WORKDIR /home/ubuntu # Add .local/bin to PATH ENV PATH="/home/ubuntu/.local/bin:${PATH}" -# What PyGEM branch to clone (either master or dev; see docker_pygem.yml) -ARG PYGEM_BRANCH=master +# What PyGEM branch to clone (either main or dev; see docker_pygem.yml) +ARG PYGEM_BRANCH=main RUN git clone --branch ${PYGEM_BRANCH} https://github.com/PyGEM-Community/PyGEM.git && \ pip install --break-system-packages -e PyGEM