Skip to content

Commit 5b77b1b

Browse files
authored
Merge pull request #2636 from fossdd/main
A bit better Documentation
2 parents a76a922 + c2ff495 commit 5b77b1b

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
name: Build
22

33
on:
4+
# Do it on every push or PR on these branches
45
push:
56
branches: [ dev, main, workflow_dispatch, features/sp-api ]
67
pull_request:
78
branches: [ dev, main, workflow_dispatch, features/sp-api ]
89

910
jobs:
11+
# Build Sonic Pi
1012
build:
1113
name: "${{matrix.title}} (${{matrix.cc}}, ${{matrix.arch}}, ${{matrix.build_type}})"
1214
runs-on: ${{matrix.os}}
@@ -83,6 +85,7 @@ jobs:
8385
otp-version: 23.2.1
8486
if: matrix.os == 'ubuntu-latest'
8587

88+
# Install Erlang on MacOS
8689
- name: Mac Erlang
8790
continue-on-error: true
8891
run: |
@@ -91,6 +94,7 @@ jobs:
9194
brew install erlang
9295
if: matrix.os == 'macos-latest'
9396

97+
# Prebuild on Ubuntu
9498
- name: Prebuild Linux
9599
working-directory: ${{github.workspace}}/app
96100
env:
@@ -100,7 +104,8 @@ jobs:
100104
sudo apt install -y pulseaudio dbus-x11 libssl-dev ruby-dev supercollider-server sc3-plugins-server alsa-utils jackd2 libjack-jackd2-dev libjack-jackd2-0 libasound2-dev librtmidi-dev pulseaudio-module-jack
101105
./linux-prebuild.sh --build-aubio
102106
if: matrix.os == 'ubuntu-latest'
103-
107+
108+
# Prebuild on Mac
104109
- name: Prebuild Mac
105110
working-directory: ${{github.workspace}}/app
106111
env:
@@ -110,6 +115,7 @@ jobs:
110115
./mac-prebuild.sh
111116
if: matrix.os == 'macos-latest'
112117

118+
# Prebuild on Windows
113119
# Note that we 'hide' the msys folders on windows to stop conflicts when building
114120
# Flac
115121
- name: Prebuild Windows
@@ -125,7 +131,8 @@ jobs:
125131

126132
#- name: Setup tmate session
127133
# uses: mxschmitt/action-tmate@v3
128-
134+
135+
# Run Configuration Config on Ubuntu
129136
- name: Config Linux
130137
working-directory: ${{github.workspace}}/app
131138
env:
@@ -134,7 +141,8 @@ jobs:
134141
run: |
135142
./linux-config.sh
136143
if: matrix.os == 'ubuntu-latest'
137-
144+
145+
# Run Configuration Config on Mac
138146
- name: Config Mac
139147
working-directory: ${{github.workspace}}/app
140148
env:
@@ -143,7 +151,8 @@ jobs:
143151
run: |
144152
./mac-config.sh
145153
if: matrix.os == 'macos-latest'
146-
154+
155+
# Run Configuration Config on Windows
147156
- name: Config Windows
148157
working-directory: ${{github.workspace}}/app
149158
shell: cmd
@@ -154,6 +163,7 @@ jobs:
154163
win-config.bat
155164
if: matrix.os == 'windows-latest'
156165

166+
# Finally: Build
157167
- name: Do build
158168
working-directory: ${{github.workspace}}/app/build
159169
run: cmake --build . --config ${{ matrix.build_type }}

BUILD-LINUX.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ cmake --build . --config Release
127127
## 4. Start Sonic Pi
128128

129129
Finally, you can run your newly compiled `Sonic Pi` app within the `build`
130-
directly either by double clicking it in the Finder or via the terminal
131-
(from within the `build` directory):
130+
directly either by double clicking it in your file manager or via the terminal
131+
(from within the `build/gui/qt/sonic-pi` directory):
132132

133133
```
134134
./sonic-pi

0 commit comments

Comments
 (0)