Skip to content

Commit

Permalink
Merge branch 'master' into feat/crystal-format
Browse files Browse the repository at this point in the history
  • Loading branch information
straight-shoota authored Nov 13, 2024
2 parents e84cfe8 + fb0baf7 commit 7533af2
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, windows-2022, macos-12]
os: [ubuntu-24.04, windows-2022, macos-13, macos-14]
defaults:
run:
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-crystal-shards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ jobs:
env:
POSTGRES_HOST_AUTH_METHOD: trust
mysql:
image: mysql:9.0
image: mysql:9.1
env:
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
redis:
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
with:
args: /bin/sh -c "psql -U postgres -h postgres -f ./test-ecosystem/scripts/pg-init.sql"
- name: Initialize mysql
uses: docker://mysql:9.0
uses: docker://mysql:9.1
with:
args: /bin/sh -c "mysql -uroot -h mysql < ./test-ecosystem/scripts/mysql-init.sql"
- name: Configure git
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
POSTGRES_HOST_AUTH_METHOD: trust

mysql:
image: mysql:5.7
image: mysql:9.1
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'

Expand Down
57 changes: 57 additions & 0 deletions test/athena.bats
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#!/usr/bin/env bats

function setup_file() {
load helper/common.bash

git_checkout https://github.com/athena-framework/athena

SHARDS_OVERRIDE=shard.dev.yml $SHARDS install
}

function setup() {
load helper/common.bash
}

function test_component() {
./scripts/test.sh "$1"
}

@test "clock" {
test_component "clock"
}
@test "console" {
test_component "console"
}
@test "dependency_injection" {
test_component "dependency_injection"
}
@test "dotenv" {
test_component "dotenv"
}
@test "event_dispatcher" {
test_component "event_dispatcher"
}
@test "framework" {
test_component "framework"
}
@test "image_size" {
test_component "image_size"
}
@test "mercure" {
test_component "mercure"
}
@test "negotiation" {
test_component "negotiation"
}
@test "routing" {
test_component "routing"
}
@test "serializer" {
test_component "serializer"
}
@test "spec" {
test_component "spec"
}
@test "validator" {
test_component "validator"
}
2 changes: 1 addition & 1 deletion test/helper/common.bash
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ MAKE="${MAKE:-make${EXE}}"

function git_checkout() {
local URL="$1"
local TARGET="$BATS_TMPDIR/${1##*/}"
local TARGET="$BATS_TMPDIR/workdir/${1##*/}"

if [ -d "$TARGET" ]; then
cd "$TARGET" || exit 1
Expand Down

0 comments on commit 7533af2

Please sign in to comment.