Fix run-all-tests.yml action, cache packages (#43)

* feat: random change (#40)

* feat: random change

* fix(run-all-tests,docker-compose): specify healthcheck compose services and extra swift test arguments

Added healthcheck conditions for httpd and selenium service in `docker-compose.yml`

* feat(run-all-tests.yml): added caching steps

* chore: update submodules

* fix(Package.swift): random change

* fixup! feat: random change (#40)

* feat(docker-compose,infra): moved dockerfiles to separate folder, created httpd compose file to install curl, healthcheck works for httpd now

* fix: try something unique

* fix: cache save 0

* feat: ci build for actions instead

* fix: remove extra args

* fix: cache logic

* fix: remove main.yml

* fix: ref

* fix: remove args?

* try other cache

* try fix: add debugging stuff

* add spet

* fix: try more

* fix; try something

* fix: use v3

* fix: fixes

* fix: remomoveve somethiing

* maybe .build path?

* test-all-tests-action

* Revert "test-all-tests-action"

This reverts commit 6239a57.

* fix(run-all-tests.yml): delete ci docker-compose, specify startup services for swifttesting step

---------

Co-authored-by: AdonisCodes <business@simonferns.com>

Author: vimscientist69

.github/workflows/main.yml

@@ -13,29 +13,21 @@ jobs:
 
       - uses: swift-actions/setup-swift@v2
         with:
-           swift-version: "6.1"
+          swift-version: "6.1"
 
       - name: Restore Build Cache
-        id: cache-build-restore
-        uses: actions/cache/restore@v4
+        id: cache-build
+        uses: actions/cache@v3
         with:
-          key: tests-build-cache-${{ hashFiles('Package.resolved') }}
-          path: .build
+            key: tests-build-cache-${{ hashFiles('Package.resolved') }}-${{ github.ref_name }}
+            path: ./.build
 
       - name: Run All Tests
         uses: GetAutomaApp/opensource-actions/swifttesting@main
         with:
           compose: "true"
-          docker_compose_extra_args: "--scale swift_web_driver=0 --scale build=0 --scale test=0 --scale shell=0"
-          required_healthy_services_docker_compose: '["httpd", "selenium"]'
-          swift_test_extra_args: "-Xswiftc -warnings-as-errors"
-
-      - name: Save Build Cache
-        id: cache-build-save
-        uses: actions/cache/save@v4
-        with:
-          path: .build
-          key: ${{ steps.cache-build-restore.outputs.cache-primary-key }}
+          required_healthy_services_docker_compose: '["selenium", "httpd"]'
+          compose_services_to_startup: '["selenium", "httpd"]'
 
     env:
       PATH: "/usr/local/bin:/usr/bin:/bin"

.github/workflows/run-all-tests.yml

@@ -2,7 +2,7 @@
 
 import PackageDescription
 
-/// A description
+/// A
 public let package = Package(
     name: "swift-webdriver",
     platforms: [

Package.swift

@@ -1,7 +1,9 @@
 services:
   httpd:
-      image: httpd
       network_mode: host
+      build:
+        context: .
+        dockerfile: ./infra/HTTPDDockerfile
       volumes:
           - ./TestAssets:/usr/local/apache2/htdocs/
       ports:
@@ -28,7 +30,9 @@ services:
 
   swift_web_driver:
     &SwiftWebDriver
-    build: .
+    build:
+      context: .
+      dockerfile: ./infra/Dockerfile
     volumes:
       - .:/SwiftWebDriver
     working_dir: /SwiftWebDriver

docker-compose.yml

@@ -0,0 +1,3 @@
+FROM httpd
+RUN apt-get update && apt-get install -y curl
+