Skip to content

Commit

Permalink
Merge pull request #77 from Backblaze/macos-12
Browse files Browse the repository at this point in the history
Replace removed macOS 11 Big Sur in favour of macOS 12 Monterey
  • Loading branch information
mlech-reef authored Aug 23, 2024
2 parents f5e3f72 + 567cb2f commit 269d4f0
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
conf:
- { runner: ubuntu-latest, os: linux, arch: amd64 }
- { runner: ubuntu-latest, os: linux, arch: arm64 }
- { runner: macos-11, os: darwin, arch: amd64 }
- { runner: macos-12, os: darwin, arch: amd64 }
# macos-13-xlarge instance are Apple silicon instances,
# only large and xlarge instances are available as of yet.
- { runner: macos-13-large, os: darwin, arch: arm64 }
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
matrix:
os:
- ubuntu-latest
- macos-11
- macos-12
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }} (ubuntu-latest)
Expand Down Expand Up @@ -93,12 +93,12 @@ jobs:
matrix:
os:
- ubuntu-latest
- macos-11
- macos-12
terraform:
- '1.5.*'
- '1.4.*'
exclude:
- os: macos-11 # for macOS, the latest terraform is enough for ACC tests
- os: macos-12 # for macOS, the latest terraform is enough for ACC tests
terraform: '1.4.*'
steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ website/vendor
# Keep windows files with windows line endings
*.winfile eol=crlf

# Skip the output from pkger
# Go
.go-version
pkged.go

# Provider binary
Expand All @@ -48,4 +49,3 @@ pkged.go
build/
dist/
venv/

3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Infrastructure
* Replace removed macOS 11 Big Sur in favour of macOS 12 Monterey in CI/CD

## [0.8.12] - 2024-06-20

### Infrastructure
Expand Down

0 comments on commit 269d4f0

Please sign in to comment.