Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove version property from services-internal.yml #58

Merged
merged 2 commits into from
Jul 3, 2024
Merged

Remove version property from services-internal.yml #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
085a23c
Remove version property from services-internal.yml
maxfierke Jul 3, 2024
296f8b3
Remove now-unneeded CI workarounds
maxfierke Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading