Skip to content

Commit

Permalink
Merge branch 'master' into feat/test-athena
Browse files Browse the repository at this point in the history
  • Loading branch information
straight-shoota authored Oct 10, 2024
2 parents b1ee3c7 + 9509994 commit e86dbe4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/test-crystal-shards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
default: 'release=1'
required: false
previous_crystal_release:
default: 'https://github.com/crystal-lang/crystal/releases/download/1.11.1/crystal-1.11.1-1-linux-x86_64.tar.gz'
default: 'https://github.com/crystal-lang/crystal/releases/download/1.14.0/crystal-1.14.0-1-linux-x86_64.tar.gz'
required: true
jobs:
build:
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
cat ../build-cache-key
- name: Build cache
id: build-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./crystal/.build/crystal
Expand All @@ -124,7 +124,7 @@ jobs:
make bin/shards CRYSTAL=../crystal/bin/crystal
bin/shards --version
- name: Artifact (with permissions)
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./test-ecosystem
Expand Down Expand Up @@ -165,19 +165,19 @@ jobs:
container: ubuntu:latest
services:
postgres:
image: postgres:16.1-alpine
image: postgres:17.0-alpine
env:
POSTGRES_HOST_AUTH_METHOD: trust
mysql:
image: mysql:8.2
image: mysql:9.0
env:
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
redis:
image: redis:alpine
needs: build
steps:
- name: Artifact (with permissions)
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./test-ecosystem
Expand All @@ -199,11 +199,11 @@ jobs:
./test-ecosystem/scripts/apt-install-crystal-deps.sh
./test-ecosystem/scripts/00-install-bats.sh
- name: Initialize postgres
uses: docker://postgres:16.1-alpine
uses: docker://postgres:17.0-alpine
with:
args: /bin/sh -c "psql -U postgres -h postgres -f ./test-ecosystem/scripts/pg-init.sql"
- name: Initialize mysql
uses: docker://mysql:8.2
uses: docker://mysql:9.0
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 @@ -2,7 +2,7 @@ version: '2.0'

services:
postgres:
image: postgres:15.3-alpine
image: postgres:17.0-alpine
environment:
POSTGRES_HOST_AUTH_METHOD: trust

Expand Down

0 comments on commit e86dbe4

Please sign in to comment.