From 9cf1ee414085a1663af9c1eabbfc0bbccaddedff Mon Sep 17 00:00:00 2001 From: Jeremy Woertink Date: Thu, 31 Oct 2024 08:40:42 -0700 Subject: [PATCH 1/5] These are all ignored because they come from the Lucky development dependency --- .gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitignore b/.gitignore index 5eb9a8cb6..9ac5afd3b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,15 @@ /lib/ /bin/ameba /bin/ameba.cr +/bin/lucky.exec.cr +/bin/lucky.watch.cr +/bin/lucky.gen.action.cr +/bin/lucky.gen.action.browser.cr +/bin/lucky.gen.action.api.cr +/bin/lucky.gen.page.cr +/bin/lucky.gen.component.cr +/bin/lucky.gen.task.cr +/bin/lucky.gen.secret_key.cr /.shards/ /tmp /config/*.local.cr From d18878373421bef70e7fe81962253e2c3fe7bb75 Mon Sep 17 00:00:00 2001 From: Jeremy Woertink Date: Thu, 31 Oct 2024 08:40:59 -0700 Subject: [PATCH 2/5] testing windows CI with new PG patch --- .github/workflows/ci.yml | 12 +++++------- shard.yml | 3 ++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd7d35f94..cf05cb40b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,13 +42,11 @@ jobs: experimental: - false include: - # NOTE: PG shard does not compile on Windows https://github.com/will/crystal-pg/issues/291 - # Until that's resolved, this will always fail, so leaving this commented out for now - # - shard_file: shard.yml - # crystal_version: latest - # postgres_version: 16 - # experimental: true - # os: windows-latest + - shard_file: shard.yml + crystal_version: latest + postgres_version: 16 + experimental: true + os: windows-latest - shard_file: shard.edge.yml crystal_version: latest postgres_version: 14 diff --git a/shard.yml b/shard.yml index c3cc28c38..628d070a7 100644 --- a/shard.yml +++ b/shard.yml @@ -17,7 +17,8 @@ dependencies: version: ~> 0.3.0 pg: github: will/crystal-pg - version: ~> 0.28.0 + branch: windowsusername + # version: ~> 0.28.0 habitat: github: luckyframework/habitat version: ~> 0.4.9 From 88385b9394f498ea8484884ff67aa91ec70d713c Mon Sep 17 00:00:00 2001 From: Jeremy Woertink Date: Thu, 31 Oct 2024 09:10:18 -0700 Subject: [PATCH 3/5] let's see what the error trace says on this --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf05cb40b..a65205406 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,7 +87,7 @@ jobs: env: DATABASE_URL: postgres://lucky:developer@localhost:5432/avram_dev - name: Run tests - run: crystal spec + run: crystal spec --error-trace env: BACKUP_DATABASE_URL: postgres://lucky:developer@localhost:5432/sample_backup DATABASE_URL: postgres://lucky:developer@localhost:5432/avram_dev From 857a9978afcb41706d66cb1493ff5a23e3abdf50 Mon Sep 17 00:00:00 2001 From: Jeremy Woertink Date: Sun, 3 Nov 2024 07:55:56 -0800 Subject: [PATCH 4/5] Using new patches in override --- .github/workflows/ci.yml | 2 +- shard.override.yml | 13 ++++++++----- shard.yml | 3 +-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a65205406..5cfecf4e7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: experimental: - false include: - - shard_file: shard.yml + - shard_file: shard.override.yml crystal_version: latest postgres_version: 16 experimental: true diff --git a/shard.override.yml b/shard.override.yml index 984938f40..2b03bb150 100644 --- a/shard.override.yml +++ b/shard.override.yml @@ -1,6 +1,9 @@ -# dependencies: +dependencies: + pg: + github: will/crystal-pg + branch: windowsusername -# development_dependencies: -# lucky: -# github: luckyframework/lucky -# branch: main +development_dependencies: + lucky: + github: luckyframework/lucky + branch: main diff --git a/shard.yml b/shard.yml index 628d070a7..c3cc28c38 100644 --- a/shard.yml +++ b/shard.yml @@ -17,8 +17,7 @@ dependencies: version: ~> 0.3.0 pg: github: will/crystal-pg - branch: windowsusername - # version: ~> 0.28.0 + version: ~> 0.28.0 habitat: github: luckyframework/habitat version: ~> 0.4.9 From d3234cac0531b6bdd65a558cfb8fdc9f935e6982 Mon Sep 17 00:00:00 2001 From: Jeremy Woertink Date: Tue, 5 Nov 2024 09:37:52 -0800 Subject: [PATCH 5/5] bump PG to latest for windows fix. --- .github/workflows/ci.yml | 4 ++-- shard.override.yml | 13 +++++-------- shard.yml | 5 +++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5cfecf4e7..8888c12b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,11 +42,11 @@ jobs: experimental: - false include: - - shard_file: shard.override.yml + - os: windows-latest + shard_file: shard.yml crystal_version: latest postgres_version: 16 experimental: true - os: windows-latest - shard_file: shard.edge.yml crystal_version: latest postgres_version: 14 diff --git a/shard.override.yml b/shard.override.yml index 2b03bb150..984938f40 100644 --- a/shard.override.yml +++ b/shard.override.yml @@ -1,9 +1,6 @@ -dependencies: - pg: - github: will/crystal-pg - branch: windowsusername +# dependencies: -development_dependencies: - lucky: - github: luckyframework/lucky - branch: main +# development_dependencies: +# lucky: +# github: luckyframework/lucky +# branch: main diff --git a/shard.yml b/shard.yml index c3cc28c38..66325350f 100644 --- a/shard.yml +++ b/shard.yml @@ -17,7 +17,7 @@ dependencies: version: ~> 0.3.0 pg: github: will/crystal-pg - version: ~> 0.28.0 + version: ~> 0.29.0 habitat: github: luckyframework/habitat version: ~> 0.4.9 @@ -49,4 +49,5 @@ development_dependencies: version: ~> 1.5.0 lucky: github: luckyframework/lucky - version: ">= 1.0.0" + branch: main + # version: ">= 1.0.0"