CI administration (#12)

* Simplify pull_request workflow a bit and rely on checks

* ci-admin script

* No need for extra script for pyinstaller; reorganize scripts

.github/workflows/pull_request.yml

@@ -1,6 +1,6 @@
 name: Pull Request
 run-name: |
-  PR #${{ github.event.pull_request.number }} [${{ github.event_name == 'pull_request' && 'updated' || 'reviewed' }}, ${{ github.event.action }}${{ github.event.pull_request.draft && ', draft' || '' }}] ${{github.event.pull_request.title}}
+  PR #${{ github.event.pull_request.number }} [${{ github.event_name == 'pull_request' && 'updated' || 'reviewed' }}, ${{ github.event_name == 'pull_request' && github.event.action || github.event.review.state }}${{ github.event.pull_request.draft && ', draft' || '' }}] ${{github.event.pull_request.title}}
 
 on:
   pull_request:
@@ -110,27 +110,13 @@ jobs:
               ;;
           esac
 
-          # Fail if no test is enabled, to report a failed check and block the PR from automerging.
-          # It is ok to generate failed run, since they will be cleaned up once the PR is closed.
-          if [ -z "${basic}${full}${test_not_needed}" ]; then
-            printf -- "ERROR: PR #${{ github.event.pull_request.number }} is not ready for testing yet.\n" >&2
-            check_failed=y
-          elif [ -n "${test_not_needed}" ]; then
-            printf -- "PR #${{ github.event.pull_request.number }} doesn't need further testing.\n" >&2
-          fi
-
           (
-            echo CHECK_FAILED=${check_failed}
+            # echo CHECK_FAILED=${check_failed}
             echo VALIDATE_BASIC=${basic}
             echo VALIDATE_FULL=${full}
             echo VALIDATE_DEB=${full}
           )  >> ${GITHUB_OUTPUT}
 
-      - name: "Fail job if check failed"
-        run: |
-          exit 1
-        if: steps.config.outputs.CHECK_FAILED
-
   basic-validation:
     needs: check-trigger
     if: ${{ needs.check-trigger.outputs.VALIDATE_BASIC }}
@@ -187,21 +173,3 @@ jobs:
       base-tag: ${{ matrix.base-tag }}
       platform: ${{ matrix.platform }}
       pull-request: true
-
-  enable-merge:
-    needs:
-      - check-trigger
-      - full-validation
-      - deb-validation
-    uses: ./.github/workflows/pull_request_check_approval.yml
-    if: ${{ needs.check-trigger.outputs.VALIDATE_FULL && !needs.check-trigger.outputs.VALIDATE_BASIC }}
-
-  enable-merge-at-once:
-    needs:
-      - check-trigger
-      - full-validation
-      - deb-validation
-      - basic-validation
-    uses: ./.github/workflows/pull_request_check_approval.yml
-    if: ${{ needs.check-trigger.outputs.VALIDATE_FULL && needs.check-trigger.outputs.VALIDATE_BASIC }}
-

.github/workflows/pull_request_closed.yml

@@ -45,10 +45,15 @@ jobs:
 
       - name: "Clean up workflow runs"
         run: |
-          src/uno/scripts/cleanup_closed_pull_request.sh \
-            ${{ github.repository }} \
-            ${{ github.event_name == 'pull_request' && github.event.pull_request.number || inputs.pr-number }} \
-            ${{ github.event_name == 'pull_request' && github.event.pull_request.merged || inputs.pr-merged }}
+          docker run --rm \
+            -v $(pwd):/workspace \
+            -e GH_TOKEN=${GH_TOKEN} \
+            -w /workspace \
+            ${ADMIN_IMAGE} \
+            src/uno/scripts/ci-admin pr-closed \
+              -r ${{ github.repository }} \
+              -N ${{ github.event_name == 'pull_request' && github.event.pull_request.number || inputs.pr-number }} \
+              ${{ (github.event_name == 'pull_request' && github.event.pull_request.merged || inputs.pr-merged) && '-m' || '' }}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ADMIN_IMAGE: ghcr.io/mentalsmash/uno-ci-admin:latest

Makefile

@@ -163,7 +163,7 @@ changelog:
 		-v $(UNO_DIR)/:/uno \
 		-w /uno \
 		$(DEB_BUILDER)  \
-		/uno/scripts/bundle/update_changelog.sh
+		/uno/scripts/debian/update_changelog.sh
 
 # Build uno's debian packages.
 # Requires the Debian Builder image.
@@ -172,7 +172,7 @@ debuild:
 		-v $(UNO_DIR)/:/uno \
 		-w /uno \
 		$(DEB_BUILDER)  \
-		/uno/scripts/debian_build.sh
+		/uno/scripts/debian/build.sh
 
 # Run integration tests using the debian package.
 # Requires the Debian Tester image

scripts/bundle/pyinstaller.sh

@@ -9,25 +9,26 @@ FLAVOR=${1:-default}
 : "${DIST_DIR:=$(pwd)/dist/bundle/${FLAVOR}}"
 [ -n "${DIST_DIR}" ]
 
-: "${BUILD_DIR:=$(pwd)/build/pyinstaller}"
+: "${BUILD_DIR:=$(pwd)/build/bundle}"
 [ -n "${BUILD_DIR}" ]
 
 (
   set -x
   rm -rf ${BUILD_DIR}
 )
 
-: "${SCRIPTS:=\
-  ./scripts/bundle/uno
-  ./uno/test/integration/runner.py}"
-[ -n "${SCRIPTS}" ]
-
 : "${VENV_PYINST:=${BUILD_DIR}/venv-pyinst}"
 [ -n "${VENV_PYINST}" ]
 
 : "${VENV_UNO:=${BUILD_DIR}/venv-uno}"
 [ -n "${VENV_UNO}" ]
 
+
+: "${SCRIPTS:=\
+  ${VENV_UNO}/bin/uno
+  ./uno/test/integration/runner.py}"
+[ -n "${SCRIPTS}" ]
+
 if [ ! -d "${VENV_PYINST}" ]; then
   (
     set -x