From 085a23c2695f4321435c0840dc8b65e3547bdd05 Mon Sep 17 00:00:00 2001 From: Max Fierke Date: Tue, 2 Jul 2024 21:01:33 -0500 Subject: [PATCH 1/2] Remove version property from services-internal.yml --- CHANGELOG.md | 2 ++ src/mstrap/templates/services-internal.yml.ecr | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e53d58d..191bc13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed +- Fix deprecation warning in newer Docker Compose versions caused by version property in `~/.mstrap/services-internal.yml` + ## [0.6.0] - 2023-10-15 ### Added diff --git a/src/mstrap/templates/services-internal.yml.ecr b/src/mstrap/templates/services-internal.yml.ecr index 7e0807e..f457fcc 100644 --- a/src/mstrap/templates/services-internal.yml.ecr +++ b/src/mstrap/templates/services-internal.yml.ecr @@ -1,6 +1,5 @@ --- # DO NOT EDIT THIS FILE. THIS IS MANAGED BY MSTRAP AND WILL BE OVERWRITTEN. -version: "3.5" services: nginx: container_name: mstrap_nginx_internal From 296f8b347e7c25f0b2f8be091e40be0b7e1982d1 Mon Sep 17 00:00:00 2001 From: Max Fierke Date: Tue, 2 Jul 2024 21:01:49 -0500 Subject: [PATCH 2/2] Remove now-unneeded CI workarounds --- .github/workflows/ci.yml | 5 +---- .github/workflows/provision.yml | 3 --- .github/workflows/release.yml | 6 ------ 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c192d45..2f426f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,18 +10,15 @@ on: jobs: macos-tests: - runs-on: macos-latest + runs-on: macos-14 steps: - name: Checkout uses: actions/checkout@v4 - # TODO: Remove openssl@3 reinstall cmd after 20240422.3 is no longer the latest - # macos-14-arm64 image - name: Install crystal and tool dependencies run: | brew install crystal meson openssl@3 - brew update && brew reinstall openssl@3 - name: Install dependencies run: shards install diff --git a/.github/workflows/provision.yml b/.github/workflows/provision.yml index 961f06d..e2f6978 100644 --- a/.github/workflows/provision.yml +++ b/.github/workflows/provision.yml @@ -23,12 +23,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 - # TODO: Remove openssl@3 reinstall cmd after 20240422.3 is no longer the latest - # macos-14-arm64 image - name: Install crystal and tool dependencies run: | brew install crystal meson openssl@3 - brew update && brew reinstall openssl@3 - name: Install dependencies run: shards install diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 56c2e4e..5725ed1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -88,12 +88,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 - # TODO: Remove openssl@3 reinstall cmd after 20240422.3 is no longer the latest - # macos-14-arm64 image - name: Install crystal and tool dependencies run: | brew install crystal meson openssl@3 - brew update && brew reinstall openssl@3 - name: Install dependencies run: shards install @@ -134,12 +131,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 - # TODO: Remove openssl@3 reinstall cmd after 20240422.3 is no longer the latest - # macos-14-arm64 image - name: Install crystal and tool dependencies run: | brew install crystal meson openssl@3 - brew update && brew reinstall openssl@3 - name: Install dependencies run: shards install