Skip to content

Commit e7e2f88

Browse files
committed
Updated github actions
1 parent 1442356 commit e7e2f88

File tree

2 files changed

+11
-35
lines changed

2 files changed

+11
-35
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,20 @@ jobs:
1111
name: Build and Test
1212
runs-on: ubuntu-latest
1313

14-
services:
15-
postgres:
16-
image: postgres:15
17-
env:
18-
POSTGRES_PASSWORD: vapor
19-
POSTGRES_USER: vapor
20-
POSTGRES_DB: vapor_test
21-
options: >-
22-
--health-cmd pg_isready
23-
--health-interval 10s
24-
--health-timeout 5s
25-
--health-retries 5
26-
ports:
27-
- 5432:5432
28-
29-
container:
30-
image: swift:6.0-jammy
31-
3214
steps:
3315
- name: Checkout code
3416
uses: actions/checkout@v4
3517

18+
- name: Install Swift
19+
uses: swift-actions/setup-swift@v2
20+
with:
21+
swift-version: "6.0"
22+
23+
- name: Install system dependencies
24+
run: |
25+
sudo apt-get update
26+
sudo apt-get install -y libssl-dev
27+
3628
- name: Cache Swift Package Manager
3729
uses: actions/cache@v4
3830
with:
@@ -43,31 +35,18 @@ jobs:
4335
restore-keys: |
4436
${{ runner.os }}-swift-
4537
46-
- name: Install system dependencies
47-
run: |
48-
apt-get update
49-
apt-get install -y libssl-dev libpq-dev
50-
5138
- name: Resolve dependencies
5239
run: swift package resolve
5340

5441
- name: Build project
5542
run: swift build --verbose
5643

57-
- name: Run tests with PostgreSQL
44+
- name: Run tests
5845
env:
59-
DATABASE_URL: postgres://vapor:vapor@postgres:5432/vapor_test
6046
JWT_SECRET: test-secret-key-for-ci
6147
LOG_LEVEL: info
6248
run: swift test --verbose
6349

64-
- name: Run tests with SQLite (fallback)
65-
env:
66-
LOG_LEVEL: info
67-
JWT_SECRET: test-secret-key-for-ci
68-
run: swift test --verbose
69-
continue-on-error: true
70-
7150
docker-build:
7251
name: Docker Build Test
7352
runs-on: ubuntu-latest

Package.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ import PackageDescription
33

44
let package = Package(
55
name: "HabitTrackerAppServer",
6-
platforms: [
7-
.macOS(.v13)
8-
],
96
dependencies: [
107
// 💧 A server-side Swift web framework.
118
.package(url: "https://github.com/vapor/vapor.git", from: "4.115.0"),

0 commit comments

Comments
 (0)