Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
mattldawson committed Feb 15, 2024
2 parents d148287 + 4db8a9d commit 73d084f
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 3 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/publish-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ jobs:
with:
submodules: recursive

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Log in to the Container repository
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
Expand All @@ -37,10 +43,10 @@ jobs:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64,linux/arm
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.21)
set(CMAKE_USER_MAKE_RULES_OVERRIDE "SetDefaults.cmake")
project(
musicbox
VERSION 1.4.2
VERSION 1.4.3
)

enable_language(Fortran)
Expand Down
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,20 @@ MusicBox: A MUSICA model for boxes and columns.

Copyright (C) 2020 National Center for Atmospheric Research

# Windows Users

> [!IMPORTANT]
> By default git will checkout the repository with `\r\n`. When running
> `make test`, if you see something related to `BAD COMMAND` or a file not found issue
> it is most likely because all of your files are using windows line endings instead of linux line endings.
> Because all of our docker files are based off of linux, things will fail.
To fix this, please configure git to use linux line endings.

```
git config --global core.autocrlf false
```

# Install and run from local git clone

```
Expand Down

0 comments on commit 73d084f

Please sign in to comment.