Skip to content

Commit 83f4727

Browse files
committed
ci: reduce steps, by using conditionals, if the commands are nearly similar
1 parent f7b5994 commit 83f4727

File tree

1 file changed

+5
-28
lines changed

1 file changed

+5
-28
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -120,48 +120,25 @@ jobs:
120120
choco install pkgconfiglite
121121
echo "PKG_CONFIG_PATH=C:/lib/pkgconfig" | Out-File -FilePath $env:GITHUB_ENV -Append
122122
123-
- name: Configure OOPetris
123+
- name: Build and Install OOPetris
124124
run: |
125125
cd oopetris
126126
meson setup build -Dbuildtype=release -Ddefault_library=shared -Dclang_libcpp=${{ matrix.config.os == 'macos' && 'enabled' || 'disabled' }} -Donly_build_libs=true ${{ matrix.config.os == 'windows' && '-Db_vscrt=static_from_buildtype' || '' }}
127+
${{ matrix.config.os == 'ubuntu' && 'sudo' || '' }} meson install -C build
127128
128-
- name: Build and install Libs
129-
if: matrix.config.os != 'ubuntu'
130-
run: |
131-
cd oopetris
132-
meson install -C build
133-
134-
- name: Build and install Libs (Linux)
135-
if: matrix.config.os == 'ubuntu'
136-
run: |
137-
cd oopetris
138-
sudo meson install -C build
139-
140-
- name: Build C Wrapper
129+
- name: Build and Install C Wrapper
141130
run: |
142131
cd oopetris_c_wrapper
143132
meson setup -Dtests=false -Dexample=false build -Dbuildtype=release -Ddefault_library=shared
144-
meson compile -C build
145-
146-
- name: Install C Wrapper
147-
if: matrix.config.os != 'ubuntu'
148-
run: |
149-
cd oopetris_c_wrapper
150-
meson install -C build
151-
152-
- name: Build and install Libs (Linux)
153-
if: matrix.config.os == 'ubuntu'
154-
run: |
155-
cd oopetris_c_wrapper
156-
sudo meson install -C build
133+
${{ matrix.config.os == 'ubuntu' && 'sudo' || '' }} meson install -C build
157134
158135
- uses: haskell-actions/setup@v2
159136
with:
160137
ghc-version: '9.6.6'
161138
enable-stack: true
162139
stack-version: 'latest'
163140

164-
- name: Build Wrapper
141+
- name: Build and Test Wrapper
165142
run: |
166143
stack build
167144
${{ matrix.config.os != 'windows' && 'sudo ldconfig' || '' }}

0 commit comments

Comments
 (0)