Skip to content

Commit

Permalink
Merge pull request #58 from maxfierke/mf-remove_services_yml_version
Browse files Browse the repository at this point in the history
Remove version property from services-internal.yml
  • Loading branch information
maxfierke authored Jul 3, 2024
2 parents 6b5474a + 296f8b3 commit 3501785
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 14 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/provision.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/mstrap/templates/services-internal.yml.ecr
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 3501785

Please sign in to comment.