diff --git a/.github/workflows/notification.yaml b/.github/workflows/notification.yaml index 84f9d4c8..7ad22ef5 100644 --- a/.github/workflows/notification.yaml +++ b/.github/workflows/notification.yaml @@ -21,18 +21,19 @@ jobs: runs-on: ubuntu-latest name: Comment on Phabricator steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 + with: + fetch-depth: 0 - name: post to phabricator run: | message="${{ github.actor }} ${{ github.event.action }} ${{ github.event.pull_request._links.html.href }}" echo "${message}" inital_commit=$(git log origin/main..origin/${{ github.head_ref }} --pretty=%H | tail -n1) - task=$(curl ${{ github.event.pull_request._links.commits.href }} | jq .[0].commit.message -r | grep "^Bug: T[0-9]*$" | head -1 | awk '{print $2}') - - if [ -n "${task}" ]; then + curl ${{ github.event.pull_request._links.commits.href }} | jq .[0].commit.message -r | grep "^Bug: T[0-9]*$" | awk '{print $2}' | while IFS= read -r done; do curl https://phabricator.wikimedia.org/api/maniphest.edit \ + -H "User-Agent: WMCS/paws github notifications" -d api.token=${{ secrets.TOOLFORGE_PHAB_BOT_KEY }} \ -d transactions[0][type]=comment \ -d transactions[0][value]="${message}" \ - -d objectIdentifier=${task} - fi + -d objectIdentifier="${task}" + done diff --git a/images/singleuser/Dockerfile b/images/singleuser/Dockerfile index 2e41816a..ce1a0661 100644 --- a/images/singleuser/Dockerfile +++ b/images/singleuser/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:24.04 -ENV PYWIKIBOT_VERSION=10.4.0 +ENV PYWIKIBOT_VERSION=10.5.0 ENV EDITOR=/bin/nano ENV PYWIKIBOT_DIR=/srv/paws ENV DEBIAN_FRONTEND=noninteractive @@ -156,7 +156,7 @@ USER root ENV OPENREFINE_DIR /srv/openrefine ENV PATH=$PATH:$OPENREFINE_DIR RUN mkdir -p ${OPENREFINE_DIR} && cd ${OPENREFINE_DIR} && \ - curl -L 'https://github.com/OpenRefine/OpenRefine/releases/download/3.9.0/openrefine-linux-3.9.0.tar.gz' | tar xzf - --strip=1 + curl -L 'https://github.com/OpenRefine/OpenRefine/releases/download/3.9.5/openrefine-linux-3.9.5.tar.gz' | tar xzf - --strip=1 USER root RUN apt-get install --yes unzip @@ -166,7 +166,7 @@ ENV REFINE_DIR /home/paws RUN pip install --no-cache-dir nb_serverproxy_openrefine USER root -RUN wget https://github.com/OpenRefine/CommonsExtension/releases/download/v0.1.3/openrefine-commons-extension-0.1.3.zip -O /tmp/openrefine-commonsextension.zip +RUN wget https://github.com/OpenRefine/CommonsExtension/releases/download/v0.1.5/openrefine-commons-extension-0.1.5-prerelease.zip -O /tmp/openrefine-commonsextension.zip RUN unzip /tmp/openrefine-commonsextension.zip -d ${OPENREFINE_DIR}/webapp/extensions/ ## Done setting up OpenRefine diff --git a/paws/values.yaml b/paws/values.yaml index abb4e921..1333ffe6 100644 --- a/paws/values.yaml +++ b/paws/values.yaml @@ -276,7 +276,7 @@ jupyterhub: fsGid: 52771 image: name: quay.io/wikimedia-paws-prod/singleuser - tag: pr-500 # singleuser tag managed by github actions + tag: pr-501 # singleuser tag managed by github actions pullPolicy: Always memory: guarantee: 0.70G