Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5101b77
feat: random change (#40)
vimscientist69 May 21, 2025
48ec400
chore: update submodules
vimscientist69 May 21, 2025
2654f92
fix(Package.swift): random change
vimscientist69 May 21, 2025
ac90dd2
Merge branch 'master' into test-all-tests-action
vimscientist69 May 21, 2025
d745b95
fixup! feat: random change (#40)
vimscientist69 May 21, 2025
524da64
feat(docker-compose,infra): moved dockerfiles to separate folder, cre…
vimscientist69 May 21, 2025
cd8d752
fix: try something unique
AdonisCodes May 21, 2025
8825260
fix: cache save 0
AdonisCodes May 21, 2025
3d39a2b
feat: ci build for actions instead
AdonisCodes May 21, 2025
303e13b
fix: remove extra args
AdonisCodes May 21, 2025
f7f8612
fix: cache logic
AdonisCodes May 21, 2025
5aa04ae
fix: remove main.yml
AdonisCodes May 21, 2025
7fabf2d
fix: ref
AdonisCodes May 21, 2025
c6fa9b5
fix: remove args?
AdonisCodes May 21, 2025
940ebae
try other cache
AdonisCodes May 21, 2025
4bdb900
try fix: add debugging stuff
AdonisCodes May 21, 2025
27324d4
add spet
AdonisCodes May 21, 2025
0ba33b0
fix: try more
AdonisCodes May 21, 2025
b89729d
fix; try something
AdonisCodes May 21, 2025
d0cdf93
fix: use v3
AdonisCodes May 21, 2025
160ecd6
fix: fixes
AdonisCodes May 21, 2025
d673283
fix: remomoveve somethiing
AdonisCodes May 21, 2025
74e28d6
maybe .build path?
AdonisCodes May 21, 2025
6239a57
test-all-tests-action
AdonisCodes May 21, 2025
e579a25
Revert "test-all-tests-action"
AdonisCodes May 21, 2025
0e826e0
fix(run-all-tests.yml): delete ci docker-compose, specify startup ser…
vimscientist69 May 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions .github/workflows/main.yml

This file was deleted.

22 changes: 7 additions & 15 deletions .github/workflows/run-all-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import PackageDescription

/// A description
/// A
public let package = Package(
name: "swift-webdriver",
platforms: [
Expand Down
8 changes: 6 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
services:
httpd:
image: httpd
network_mode: host
build:
context: .
dockerfile: ./infra/HTTPDDockerfile
volumes:
- ./TestAssets:/usr/local/apache2/htdocs/
ports:
Expand All @@ -28,7 +30,9 @@ services:

swift_web_driver:
&SwiftWebDriver
build: .
build:
context: .
dockerfile: ./infra/Dockerfile
volumes:
- .:/SwiftWebDriver
working_dir: /SwiftWebDriver
Expand Down
File renamed without changes.
3 changes: 3 additions & 0 deletions infra/HTTPDDockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM httpd
RUN apt-get update && apt-get install -y curl

Loading