Skip to content

Commit

Permalink
Merge pull request #2 from m1m0zzz/develop (Release: v1.1.1)
Browse files Browse the repository at this point in the history
v1.1.1
  • Loading branch information
m1m0zzz authored Jun 27, 2024
2 parents ba627fd + 8ed282e commit 0611226
Show file tree
Hide file tree
Showing 18 changed files with 1,284 additions and 1,309 deletions.
2 changes: 2 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BasedOnStyle: Google
ColumnLimit: 100
19 changes: 12 additions & 7 deletions .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
name: CMake on multiple platforms

on:
pull_request:
branches: [main]
types: [closed]
push:
branches: [ "main", "develop" ]

permissions:
contents: write

jobs:
build:
runs-on: ${{ matrix.os }}

strategy:
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
fail-fast: false

# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
matrix:
# windows: cl
# mac: clang
# ubuntu: clang, gcc
os: [windows-latest, macos-latest, ubuntu-latest]
build_type: [Release]
c_compiler: [cl, clang, gcc]
Expand Down Expand Up @@ -52,13 +52,18 @@ jobs:
c_compiler: gcc
- os: ubuntu-latest
c_compiler: cl

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
with:
# include JUCE folder
submodules: true

- uses: maxim-lobanov/setup-xcode@v1
if: matrix.os == 'macos-latest'
with:
xcode-version: latest-stable

- name: Set reusable strings
# Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
id: strings
Expand Down Expand Up @@ -115,7 +120,7 @@ jobs:
# TODO: submodulesが含まれるの lib ディレクトリがコピーされている?
# このアクションを使わずに ブランチを作成しpushする
- name: Deploy to branch
if: matrix.c_compiler != 'gcc'
if: github.ref == 'refs/heads/main' && matrix.c_compiler != 'gcc'
uses: s0/[email protected]
env:
REPO: self
Expand Down
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
cmake_minimum_required(VERSION 3.15)

PROJECT(UTILTY_CLONE
LANGUAGES CXX
VERSION 0.0.1
)
PROJECT(UTILTY_CLONE LANGUAGES CXX VERSION 1.1.1)

# for clang-tidy(this enable to find system header files).
if(CMAKE_EXPORT_COMPILE_COMMANDS)
Expand Down
3 changes: 2 additions & 1 deletion Source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ juce_add_plugin(UtilityClone

PRODUCT_NAME "Utility clone") # The name of the final

target_compile_options(UtilityClone PUBLIC -w)
target_compile_options(UtilityClone PUBLIC -Wall)
# target_compile_options(UtilityClone PUBLIC $<$<PLATFORM_ID:Darwin>: -w>)

target_compile_features(UtilityClone PUBLIC cxx_std_17)

Expand Down
Loading

0 comments on commit 0611226

Please sign in to comment.