From ad3c9bedb0e4ac16115a189e84a1cbef9b81b2f5 Mon Sep 17 00:00:00 2001
From: "James D. Mitchell" <jdm3@st-andrews.ac.uk>
Date: Fri, 6 Oct 2023 17:58:16 +0100
Subject: [PATCH] ci: simplify workspace tests

---
 .github/workflows/workspaces.yml  |  9 +++++++--
 ci/launch-gap-docker-container.sh | 20 --------------------
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100755 ci/launch-gap-docker-container.sh

diff --git a/.github/workflows/workspaces.yml b/.github/workflows/workspaces.yml
index 84d586ec4..f9c273c50 100644
--- a/.github/workflows/workspaces.yml
+++ b/.github/workflows/workspaces.yml
@@ -16,9 +16,14 @@ on:
 
 jobs:
   workspaces:
-      name: "GAP 4.12.2 / ubuntu / 64"
+      name: "GAP 4.12.2 / ubuntu / 64-bit"
       runs-on: ubuntu-latest
+      container:
+          image: jamesdbmitchell/gap-docker-minimal:version-4.12.2
+          options: --user root
+          volumes: 
+            - ${{ github.workspace }}:/home/gap/inst/gap-4.12.2/pkg
       steps:
           - uses: actions/checkout@v3
           - name: "Run Semigroups packages' workspace tests"
-            run: ci/launch-gap-docker-container.sh
+            run: ci/run-tests-gap-tests-in-docker-container.sh
diff --git a/ci/launch-gap-docker-container.sh b/ci/launch-gap-docker-container.sh
deleted file mode 100755
index 7c32e9740..000000000
--- a/ci/launch-gap-docker-container.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-# This file is temporarily copied from libsemigroups/ci/ file of the same name.
-set -e
-
-CONTAINER_NAME="jamesdbmitchell/gap-docker-minimal:version-4.12.2"
-
-# Pull the docker container
-docker pull "$CONTAINER_NAME" 
-
-# Start the docker container detached
-ID=$(docker run --rm -i -d "$CONTAINER_NAME")
-
-# Copy the libsemigroups directory into the container
-docker cp . "$ID:/home/gap/semigroups"
-
-# Run the ci/docker-gap.sh script in the running container
-docker exec -i "$ID" semigroups/ci/run-gap-tests-in-docker-container.sh ; exit
-
-# Attach to the container
-docker attach "$ID"