Skip to content

Commit

Permalink
Cleaning up for Crystal 1.0 support (#52)
Browse files Browse the repository at this point in the history
* Updating crystal version constraint for allowing through 1.0. Cleaning up CI with matrix

* make sure it locks habitat to the latest

* Using LuckyEnv to hopefully make the crystal constraint happy in CI

* Fixing the CI. Moving to master branches while we get the CI happy

* Adding back integration spec guards for CI
  • Loading branch information
jwoertink authored Mar 23, 2021
1 parent 0c7b6f5 commit 03d229e
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 13 deletions.
28 changes: 22 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Lucky Carbon CI
name: Carbon CI

on:
push:
Expand All @@ -8,9 +8,17 @@ on:

jobs:
check_format:
strategy:
fail-fast: false
matrix:
crystal_version:
- 0.36.1
- 1.0.0
experimental:
- false
runs-on: ubuntu-latest
container:
image: crystallang/crystal:0.36.1
continue-on-error: ${{ matrix.experimental }}
container: crystallang/crystal:${{ matrix.crystal_version }}-alpine
steps:
- uses: actions/checkout@v1
- name: Install shards
Expand All @@ -20,12 +28,20 @@ jobs:
- name: Lint
run: ./bin/ameba
specs:
strategy:
fail-fast: false
matrix:
crystal_version:
- 0.36.1
- 1.0.0
experimental:
- false
runs-on: ubuntu-latest
container:
image: crystallang/crystal:0.36.1
continue-on-error: ${{ matrix.experimental }}
container: crystallang/crystal:${{ matrix.crystal_version }}-alpine
steps:
- uses: actions/checkout@v2
- name: Install shards
- name: Install dependencies
run: shards install
- name: Cache Crystal
uses: actions/cache@v1
Expand Down
10 changes: 5 additions & 5 deletions shard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ version: 0.1.3
authors:
- Paul Smith <[email protected]>

crystal: 0.36.1
crystal: ">= 0.36.1, < 2.0.0"

license: MIT

dependencies:
habitat:
github: luckyframework/habitat
version: ~> 0.4.4
branch: master

development_dependencies:
dotenv:
github: gdotdesign/cr-dotenv
version: 0.7.0
lucky_env:
github: luckyframework/lucky_env
branch: master

ameba:
github: crystal-ameba/ameba
Expand Down
4 changes: 2 additions & 2 deletions spec/spec_helper.cr
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
require "spec"
require "../src/carbon"
require "./support/**"
require "dotenv"
require "lucky_env"

Dotenv.load
LuckyEnv.load(".env")

Spec.before_each do
Carbon::DevAdapter.reset
Expand Down

0 comments on commit 03d229e

Please sign in to comment.