From 5101b77bf69f8a403f55eb9435888391f0f74d54 Mon Sep 17 00:00:00 2001 From: William Ferns Date: Wed, 21 May 2025 01:19:58 -0500 Subject: [PATCH 01/25] 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 --- .github/workflows/run-all-tests.yml | 15 +++++++++++++++ docker-compose.yml | 17 ++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 841d43e..409e98d 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -15,9 +15,24 @@ jobs: with: swift-version: "6.1" + - name: Restore Build Cache + id: cache-build-restore + uses: actions/cache/restore@v4 + with: + key: tests-build-cache-${{ hashFiles('Package.resolved') }} + path: .build + - name: Run All Tests uses: GetAutomaApp/opensource-actions/swifttesting@main with: compose: "true" + + - 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 }} + env: PATH: "/usr/local/bin:/usr/bin:/bin" diff --git a/docker-compose.yml b/docker-compose.yml index 1b4a613..6aabeb8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: httpd: image: httpd @@ -7,6 +6,11 @@ services: - ./TestAssets:/usr/local/apache2/htdocs/ ports: - "80:80" + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost"] + interval: 30s + timeout: 10s + retries: 3 selenium: image: selenium/standalone-chrome:4.2.1-20220531 @@ -16,6 +20,11 @@ services: - 7900:7900 environment: - SE_NODE_MAX_SESSIONS=4 + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:4444/status"] + interval: 30s + timeout: 10s + retries: 3 swift_web_driver: &SwiftWebDriver @@ -28,8 +37,10 @@ services: SELENIUM_URL: http://localhost:4444 tty: true depends_on: - - selenium - - httpd + selenium: + condition: service_healthy + httpd: + condition: service_healthy build: <<: *SwiftWebDriver From 48ec400ced739e570993886f3ab3a16276d1ebfa Mon Sep 17 00:00:00 2001 From: William Date: Wed, 21 May 2025 08:31:30 +0200 Subject: [PATCH 02/25] chore: update submodules --- .dotfiles | 2 +- .swiftformat | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) mode change 100644 => 120000 .swiftformat diff --git a/.dotfiles b/.dotfiles index 66a9354..b8df711 160000 --- a/.dotfiles +++ b/.dotfiles @@ -1 +1 @@ -Subproject commit 66a9354e4071812a8f14e251ae99c3fa44f53cf3 +Subproject commit b8df7116646707f52e7b3ed2c28b4d6049381eb3 diff --git a/.swiftformat b/.swiftformat deleted file mode 100644 index dd78bef..0000000 --- a/.swiftformat +++ /dev/null @@ -1,6 +0,0 @@ ---maxwidth 120 ---allman false ---indent 4 ---trimwhitespace always ---header "{file}\nCopyright (c) {year} GetAutomaApp\nAll source code and related assets are the property of GetAutomaApp.\nAll rights reserved.\n\nThis package is freely distributable under the MIT license.\nThis Package is a modified fork of https://github.com/ashi-psn/SwiftWebDriver." ---disable redundantInternal diff --git a/.swiftformat b/.swiftformat new file mode 120000 index 0000000..eb40906 --- /dev/null +++ b/.swiftformat @@ -0,0 +1 @@ +./.dotfiles/.swiftformat-base \ No newline at end of file From 2654f92e4437dd61c469e756f040e72d48fcbd36 Mon Sep 17 00:00:00 2001 From: William Date: Wed, 21 May 2025 08:33:05 +0200 Subject: [PATCH 03/25] fix(Package.swift): random change --- Package.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Package.swift b/Package.swift index ae3fccd..c883999 100644 --- a/Package.swift +++ b/Package.swift @@ -2,6 +2,7 @@ import PackageDescription +/// A description public let package = Package( name: "swift-webdriver", platforms: [ From d745b95e6dc7201897fb886dcbbe6848ee9f5625 Mon Sep 17 00:00:00 2001 From: William Date: Wed, 21 May 2025 08:47:48 +0200 Subject: [PATCH 04/25] fixup! feat: random change (#40) --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index c883999..69b6124 100644 --- a/Package.swift +++ b/Package.swift @@ -2,7 +2,7 @@ import PackageDescription -/// A description +/// A public let package = Package( name: "swift-webdriver", platforms: [ From 524da642a6aee0c5d97d309d1a0ae9c194aa3e10 Mon Sep 17 00:00:00 2001 From: William Date: Wed, 21 May 2025 09:31:15 +0200 Subject: [PATCH 05/25] feat(docker-compose,infra): moved dockerfiles to separate folder, created httpd compose file to install curl, healthcheck works for httpd now --- docker-compose.yml | 8 ++++++-- Dockerfile => infra/Dockerfile | 0 infra/HTTPDDockerfile | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) rename Dockerfile => infra/Dockerfile (100%) create mode 100644 infra/HTTPDDockerfile diff --git a/docker-compose.yml b/docker-compose.yml index 6aabeb8..d013105 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 diff --git a/Dockerfile b/infra/Dockerfile similarity index 100% rename from Dockerfile rename to infra/Dockerfile diff --git a/infra/HTTPDDockerfile b/infra/HTTPDDockerfile new file mode 100644 index 0000000..54a1c1b --- /dev/null +++ b/infra/HTTPDDockerfile @@ -0,0 +1,3 @@ +FROM httpd +RUN apt-get update && apt-get install -y curl + From cd8d752cb3dc970013fa517e6b0386c9015f8ae7 Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 04:50:16 -0600 Subject: [PATCH 06/25] fix: try something unique --- .github/workflows/run-all-tests.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 233be7e..f9bab5e 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -22,6 +22,17 @@ jobs: key: tests-build-cache-${{ hashFiles('Package.resolved') }} path: .build + - name: Build + run: swift build + + - name: Save Build Cache + if: always() + id: cache-build-save + uses: actions/cache/save@v4 + with: + path: .build + key: tests-build-cache-${{ hashFiles('Package.resolved') }} + - name: Run All Tests uses: GetAutomaApp/opensource-actions/swifttesting@main with: From 8825260560e5cdae0731047f619bfe82afd882b9 Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 04:51:21 -0600 Subject: [PATCH 07/25] fix: cache save 0 --- .github/workflows/run-all-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index f9bab5e..4760ac9 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -27,7 +27,7 @@ jobs: - name: Save Build Cache if: always() - id: cache-build-save + id: cache-build-save-0 uses: actions/cache/save@v4 with: path: .build From 3d39a2bb2ac012545a0ebe072212dc24b84eac26 Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 05:01:50 -0600 Subject: [PATCH 08/25] feat: ci build for actions instead --- .github/workflows/run-all-tests.yml | 1 + docker-compose.ci.yml | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 docker-compose.ci.yml diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 4760ac9..390fc16 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -40,6 +40,7 @@ jobs: docker_compose_extra_args: "--scale swift_web_driver=0 --scale build=0 --scale shell=0" swift_test_extra_args: "-Xswiftc -warnings-as-errors" required_healthy_services_docker_compose: '["selenium", "httpd"]' + compose_file: docker-compose.ci.yml - name: Save Build Cache id: cache-build-save diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml new file mode 100644 index 0000000..ec9cd75 --- /dev/null +++ b/docker-compose.ci.yml @@ -0,0 +1,29 @@ +services: + httpd: + network_mode: host + build: + context: . + dockerfile: ./infra/HTTPDDockerfile + volumes: + - ./TestAssets:/usr/local/apache2/htdocs/ + ports: + - "80:80" + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost"] + interval: 30s + timeout: 10s + retries: 3 + + selenium: + image: selenium/standalone-chrome:4.2.1-20220531 + network_mode: host + ports: + - 4444:4444 + - 7900:7900 + environment: + - SE_NODE_MAX_SESSIONS=4 + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:4444/status"] + interval: 30s + timeout: 10s + retries: 3 \ No newline at end of file From 303e13b68166361be868301f66d2cea57f0a7044 Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 05:02:04 -0600 Subject: [PATCH 09/25] fix: remove extra args --- .github/workflows/run-all-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 390fc16..318d301 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -37,7 +37,6 @@ jobs: uses: GetAutomaApp/opensource-actions/swifttesting@main with: compose: "true" - docker_compose_extra_args: "--scale swift_web_driver=0 --scale build=0 --scale shell=0" swift_test_extra_args: "-Xswiftc -warnings-as-errors" required_healthy_services_docker_compose: '["selenium", "httpd"]' compose_file: docker-compose.ci.yml From f7f8612042e8779884b4c36a8243b436a799a96b Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 05:07:29 -0600 Subject: [PATCH 10/25] fix: cache logic --- .github/workflows/run-all-tests.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 318d301..3088f81 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -22,17 +22,6 @@ jobs: key: tests-build-cache-${{ hashFiles('Package.resolved') }} path: .build - - name: Build - run: swift build - - - name: Save Build Cache - if: always() - id: cache-build-save-0 - uses: actions/cache/save@v4 - with: - path: .build - key: tests-build-cache-${{ hashFiles('Package.resolved') }} - - name: Run All Tests uses: GetAutomaApp/opensource-actions/swifttesting@main with: @@ -42,6 +31,7 @@ jobs: compose_file: docker-compose.ci.yml - name: Save Build Cache + if: always() id: cache-build-save uses: actions/cache/save@v4 with: From 5aa04aeb8667579deac4022d6e710b52d281fa7d Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 05:08:15 -0600 Subject: [PATCH 11/25] fix: remove main.yml --- .github/workflows/main.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 04e1463..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Docker Image CI - -on: - pull_request: - branches: - - "develop" - - "master" - -jobs: - test: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - - uses: KengoTODA/actions-setup-docker-compose@v1 - with: - version: "2.14.2" - - - name: Build And Run Docker image - run: | - docker-compose build --no-cache - docker-compose up selenium -d - docker-compose run test From 7fabf2deb4b97ec0c7029d66e7d57d06906fd7ba Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 05:23:17 -0600 Subject: [PATCH 12/25] fix: ref --- .github/workflows/run-all-tests.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 3088f81..c42c9b3 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -17,7 +17,7 @@ jobs: - name: Restore Build Cache id: cache-build-restore - uses: actions/cache/restore@v4 + uses: actions/cache@v4 with: key: tests-build-cache-${{ hashFiles('Package.resolved') }} path: .build @@ -30,13 +30,5 @@ jobs: required_healthy_services_docker_compose: '["selenium", "httpd"]' compose_file: docker-compose.ci.yml - - name: Save Build Cache - if: always() - id: cache-build-save - uses: actions/cache/save@v4 - with: - path: .build - key: ${{ steps.cache-build-restore.outputs.cache-primary-key }} - env: PATH: "/usr/local/bin:/usr/bin:/bin" From c6fa9b56b663e5790269c8939590e3a7a69cb9d2 Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 05:33:25 -0600 Subject: [PATCH 13/25] fix: remove args? --- .github/workflows/run-all-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index c42c9b3..59b135a 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -26,7 +26,6 @@ jobs: uses: GetAutomaApp/opensource-actions/swifttesting@main with: compose: "true" - swift_test_extra_args: "-Xswiftc -warnings-as-errors" required_healthy_services_docker_compose: '["selenium", "httpd"]' compose_file: docker-compose.ci.yml From 940ebaef7c27f2af36694e2844d1f04b63116bea Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 05:40:42 -0600 Subject: [PATCH 14/25] try other cache --- .github/workflows/run-all-tests.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 59b135a..d47b618 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -13,11 +13,11 @@ 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@v4 + uses: actions/cache/restore@v4 with: key: tests-build-cache-${{ hashFiles('Package.resolved') }} path: .build @@ -29,5 +29,11 @@ jobs: required_healthy_services_docker_compose: '["selenium", "httpd"]' compose_file: docker-compose.ci.yml + - name: Save Build Cache + uses: actions/cache/save@v4 + with: + key: ${{ steps.cache-build-restore.outputs.cache-primary-key }} + path: .build + env: PATH: "/usr/local/bin:/usr/bin:/bin" From 4bdb900b34b8e8a42ffae7f7cd1bb959cc2770db Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 05:49:23 -0600 Subject: [PATCH 15/25] try fix: add debugging stuff --- .github/workflows/run-all-tests.yml | 38 +++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index d47b618..a96a639 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -9,12 +9,23 @@ jobs: all-tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - name: Checkout Repo + uses: actions/checkout@v4 - - uses: swift-actions/setup-swift@v2 + - name: Set Up Swift + uses: swift-actions/setup-swift@v2 with: swift-version: "6.1" + - name: Show Initial Working Directory + run: | + echo "🔍 Working Directory:" + pwd + echo "🔍 Directory Contents Before Cache Restore:" + ls -alh + echo "🔍 Disk Usage:" + du -sh . || true + - name: Restore Build Cache id: cache-build-restore uses: actions/cache/restore@v4 @@ -22,6 +33,20 @@ jobs: key: tests-build-cache-${{ hashFiles('Package.resolved') }} path: .build + - name: Post-Restore Cache Debug Info + run: | + echo "🔁 Restored cache key: ${{ steps.cache-build-restore.outputs.cache-primary-key }}" + echo "✅ Cache Hit: ${{ steps.cache-build-restore.outputs.cache-hit }}" + echo "📂 .build Directory After Cache Restore:" + ls -alR .build || echo ".build not restored" + echo "📦 .build Size:" + du -sh .build || echo ".build not found" + + - name: Show Swift Environment + run: | + swift --version + env | sort + - name: Run All Tests uses: GetAutomaApp/opensource-actions/swifttesting@main with: @@ -29,6 +54,15 @@ jobs: required_healthy_services_docker_compose: '["selenium", "httpd"]' compose_file: docker-compose.ci.yml + - name: Post-Test .build Debug + run: | + echo "📂 .build Contents After Tests:" + ls -alR .build || echo "no .build" + echo "📦 .build Disk Usage:" + du -sh .build || echo "no .build" + echo "📄 .build/debug contents:" + ls -alR .build/debug || echo "no debug folder" + - name: Save Build Cache uses: actions/cache/save@v4 with: From 27324d45a9070395d32835439769937ef2e536a2 Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 05:55:36 -0600 Subject: [PATCH 16/25] add spet --- .github/workflows/run-all-tests.yml | 39 +++-------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index a96a639..3bd7490 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -9,22 +9,14 @@ jobs: all-tests: runs-on: ubuntu-latest steps: - - name: Checkout Repo - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - - name: Set Up Swift - uses: swift-actions/setup-swift@v2 + - uses: swift-actions/setup-swift@v2 with: swift-version: "6.1" - - name: Show Initial Working Directory - run: | - echo "🔍 Working Directory:" - pwd - echo "🔍 Directory Contents Before Cache Restore:" - ls -alh - echo "🔍 Disk Usage:" - du -sh . || true + - name: Create .build Directory + run: mkdir -p .build - name: Restore Build Cache id: cache-build-restore @@ -33,20 +25,6 @@ jobs: key: tests-build-cache-${{ hashFiles('Package.resolved') }} path: .build - - name: Post-Restore Cache Debug Info - run: | - echo "🔁 Restored cache key: ${{ steps.cache-build-restore.outputs.cache-primary-key }}" - echo "✅ Cache Hit: ${{ steps.cache-build-restore.outputs.cache-hit }}" - echo "📂 .build Directory After Cache Restore:" - ls -alR .build || echo ".build not restored" - echo "📦 .build Size:" - du -sh .build || echo ".build not found" - - - name: Show Swift Environment - run: | - swift --version - env | sort - - name: Run All Tests uses: GetAutomaApp/opensource-actions/swifttesting@main with: @@ -54,15 +32,6 @@ jobs: required_healthy_services_docker_compose: '["selenium", "httpd"]' compose_file: docker-compose.ci.yml - - name: Post-Test .build Debug - run: | - echo "📂 .build Contents After Tests:" - ls -alR .build || echo "no .build" - echo "📦 .build Disk Usage:" - du -sh .build || echo "no .build" - echo "📄 .build/debug contents:" - ls -alR .build/debug || echo "no debug folder" - - name: Save Build Cache uses: actions/cache/save@v4 with: From 0ba33b082c858707a586ca499f9f5d03e4588a20 Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 05:59:52 -0600 Subject: [PATCH 17/25] fix: try more --- .github/workflows/run-all-tests.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 3bd7490..e400194 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -19,11 +19,11 @@ jobs: run: mkdir -p .build - name: Restore Build Cache - id: cache-build-restore - uses: actions/cache/restore@v4 + id: cache-build + uses: actions/cache@v4 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 @@ -32,11 +32,5 @@ jobs: required_healthy_services_docker_compose: '["selenium", "httpd"]' compose_file: docker-compose.ci.yml - - name: Save Build Cache - uses: actions/cache/save@v4 - with: - key: ${{ steps.cache-build-restore.outputs.cache-primary-key }} - path: .build - env: PATH: "/usr/local/bin:/usr/bin:/bin" From b89729df72fc1677adfe43a4631e3efcda178df7 Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 06:27:12 -0600 Subject: [PATCH 18/25] fix; try something --- .github/workflows/run-all-tests.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index e400194..326ade7 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -15,9 +15,6 @@ jobs: with: swift-version: "6.1" - - name: Create .build Directory - run: mkdir -p .build - - name: Restore Build Cache id: cache-build uses: actions/cache@v4 @@ -25,6 +22,10 @@ jobs: key: tests-build-cache-${{ hashFiles('Package.resolved') }}-${{ github.ref_name }} path: .build + - name: Build For Testing + run: | + swift build --build-tests -Xswiftc -DSWIFT_PM_SUPPORTS_SWIFT_TESTING + - name: Run All Tests uses: GetAutomaApp/opensource-actions/swifttesting@main with: From d0cdf93f98c1f8d3f76671e140cf7456af8a32a6 Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 06:45:52 -0600 Subject: [PATCH 19/25] fix: use v3 --- .github/workflows/run-all-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 326ade7..42b3fd7 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -17,7 +17,7 @@ jobs: - name: Restore Build Cache id: cache-build - uses: actions/cache@v4 + uses: actions/cache@v3 with: key: tests-build-cache-${{ hashFiles('Package.resolved') }}-${{ github.ref_name }} path: .build From 160ecd6cf6c8f7963a108043f1db4ca6e42a9349 Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 06:48:28 -0600 Subject: [PATCH 20/25] fix: fixes --- .github/workflows/run-all-tests.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 42b3fd7..0411fef 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -22,10 +22,6 @@ jobs: key: tests-build-cache-${{ hashFiles('Package.resolved') }}-${{ github.ref_name }} path: .build - - name: Build For Testing - run: | - swift build --build-tests -Xswiftc -DSWIFT_PM_SUPPORTS_SWIFT_TESTING - - name: Run All Tests uses: GetAutomaApp/opensource-actions/swifttesting@main with: From d673283a42883b04a26f7d807bdc307f7dcf6c2c Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 06:55:38 -0600 Subject: [PATCH 21/25] fix: remomoveve somethiing --- .github/workflows/run-all-tests.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 0411fef..53da7fc 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -27,7 +27,4 @@ jobs: with: compose: "true" required_healthy_services_docker_compose: '["selenium", "httpd"]' - compose_file: docker-compose.ci.yml - - env: - PATH: "/usr/local/bin:/usr/bin:/bin" + compose_file: docker-compose.ci.yml \ No newline at end of file From 74e28d6e1c75a873d9dad48aa7913fcb5f9fd3dd Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 06:57:57 -0600 Subject: [PATCH 22/25] maybe .build path? --- .github/workflows/run-all-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 53da7fc..33538d1 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -20,7 +20,7 @@ jobs: uses: actions/cache@v3 with: key: tests-build-cache-${{ hashFiles('Package.resolved') }}-${{ github.ref_name }} - path: .build + path: ./.build - name: Run All Tests uses: GetAutomaApp/opensource-actions/swifttesting@main From 6239a57f6649e2ea702005ab011fa0cef6e8ba30 Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 07:16:59 -0600 Subject: [PATCH 23/25] test-all-tests-action --- .github/workflows/run-all-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 33538d1..f18a942 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -23,7 +23,7 @@ jobs: path: ./.build - name: Run All Tests - uses: GetAutomaApp/opensource-actions/swifttesting@main + uses: GetAutomaApp/opensource-actions/swifttesting@simon/testing-building with: compose: "true" required_healthy_services_docker_compose: '["selenium", "httpd"]' From e579a25d1bc19f6717d4687c0c657339647110e1 Mon Sep 17 00:00:00 2001 From: AdonisCodes Date: Wed, 21 May 2025 07:23:52 -0600 Subject: [PATCH 24/25] Revert "test-all-tests-action" This reverts commit 6239a57f6649e2ea702005ab011fa0cef6e8ba30. --- .github/workflows/run-all-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index f18a942..33538d1 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -23,7 +23,7 @@ jobs: path: ./.build - name: Run All Tests - uses: GetAutomaApp/opensource-actions/swifttesting@simon/testing-building + uses: GetAutomaApp/opensource-actions/swifttesting@main with: compose: "true" required_healthy_services_docker_compose: '["selenium", "httpd"]' From 0e826e06474e9034f290b46550530b19d19e804c Mon Sep 17 00:00:00 2001 From: William Date: Thu, 22 May 2025 07:53:33 +0200 Subject: [PATCH 25/25] fix(run-all-tests.yml): delete ci docker-compose, specify startup services for swifttesting step --- .github/workflows/run-all-tests.yml | 5 ++++- docker-compose.ci.yml | 29 ----------------------------- 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 docker-compose.ci.yml diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 33538d1..1822eaf 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -27,4 +27,7 @@ jobs: with: compose: "true" required_healthy_services_docker_compose: '["selenium", "httpd"]' - compose_file: docker-compose.ci.yml \ No newline at end of file + compose_services_to_startup: '["selenium", "httpd"]' + + env: + PATH: "/usr/local/bin:/usr/bin:/bin" diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml deleted file mode 100644 index ec9cd75..0000000 --- a/docker-compose.ci.yml +++ /dev/null @@ -1,29 +0,0 @@ -services: - httpd: - network_mode: host - build: - context: . - dockerfile: ./infra/HTTPDDockerfile - volumes: - - ./TestAssets:/usr/local/apache2/htdocs/ - ports: - - "80:80" - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost"] - interval: 30s - timeout: 10s - retries: 3 - - selenium: - image: selenium/standalone-chrome:4.2.1-20220531 - network_mode: host - ports: - - 4444:4444 - - 7900:7900 - environment: - - SE_NODE_MAX_SESSIONS=4 - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:4444/status"] - interval: 30s - timeout: 10s - retries: 3 \ No newline at end of file