Skip to content

Commit

Permalink
fix: try bazel again after help from joannis
Browse files Browse the repository at this point in the history
  • Loading branch information
cmgriffing committed Mar 12, 2024
1 parent c1839cf commit 18d6016
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 41 deletions.
55 changes: 31 additions & 24 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,13 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: swift-actions/setup-swift@v2
with:
swift-version: "5.5.3"

- name: Get swift version
run: swift --version

- name: Cache Bazel
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -207,27 +214,27 @@ jobs:
# env:
# TEST_SERVER_HOST: test-server

test-swift:
runs-on: ubuntu-latest
container: swift:5.5-focal
needs: ["publish-test-server"]

services:
test-server:
credentials:
username: vexilla
password: ${{secrets.GITHUB_TOKEN}}
image: ghcr.io/vexilla/test-server:latest
ports:
- 3000:3000
options: |
--health-cmd "curl -f http://localhost:3000/manifest.json"
steps:
- uses: actions/checkout@v3

- run: |
cd ./clients/swift
swift test
env:
TEST_SERVER_HOST: test-server:3000
# test-swift:
# runs-on: ubuntu-latest
# container: swift:5.5-focal
# needs: ["publish-test-server"]

# services:
# test-server:
# credentials:
# username: vexilla
# password: ${{secrets.GITHUB_TOKEN}}
# image: ghcr.io/vexilla/test-server:latest
# ports:
# - 3000:3000
# options: |
# --health-cmd "curl -f http://localhost:3000/manifest.json"

# steps:
# - uses: actions/checkout@v3
# # LEAVING OFF: Build fails at setUp and then complains about all sorts of undefined props/methods that definitely work locally
# - run: |
# cd ./clients/swift
# swift test
# env:
# TEST_SERVER_HOST: test-server:3000
1 change: 0 additions & 1 deletion clients/swift/BROKEN_BUILD → clients/swift/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ swift_test(
"Tests/VexillaClientTests/HashingTests.swift",
"Tests/VexillaClientTests/SchedulingTests.swift",
"Tests/VexillaClientTests/VexillaClientTests.swift",
"Tests/VexillaClientTests/XCTestManifests.swift",
],
target_compatible_with = ["@platforms//os:macos"],
deps = [":vexilla_client_lib"],
Expand Down
7 changes: 0 additions & 7 deletions clients/swift/Tests/LinuxMain.swift

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
@testable import VexillaClient
import XCTest

#if canImport(FoundationNetworking)
import FoundationNetworking
#endif

final class VexillaClientTests: XCTestCase {
var vexillaClient: VexillaClient = .init(environment: "dev", baseUrl: ProcessInfo.processInfo.environment["TEST_SERVER_HOST"] ?? "http://localhost:3000", instanceId: "b7e91cc5-ec76-4ec3-9c1c-075032a13a1a")

Expand Down
9 changes: 0 additions & 9 deletions clients/swift/Tests/VexillaClientTests/XCTestManifests.swift

This file was deleted.

0 comments on commit 18d6016

Please sign in to comment.