Skip to content

Commit

Permalink
Make Github CI use macOS x86_64
Browse files Browse the repository at this point in the history
Github changed it to default to macOS ARM64.
  • Loading branch information
zturtleman committed Jul 20, 2024
1 parent 4f94175 commit d6c265a
Showing 1 changed file with 2 additions and 89 deletions.
91 changes: 2 additions & 89 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,96 +2,9 @@ name: Build
on: [push, pull_request]

jobs:
linux-configure-gcc:
name: GCC (Linux)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt update
sudo apt install autoconf automake make gcc g++ qtbase5-dev qtbase5-dev-tools qttools5-dev-tools libgl1-mesa-dev
- name: autogen.sh
run: ./autogen.sh
- name: configure
run: CC=gcc CXX=g++ ./configure
- name: make
run: make
- name: make install
run: sudo make install

linux-configure-clang:
name: Clang (Linux)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt update
sudo apt install autoconf automake make gcc g++ qtbase5-dev qtbase5-dev-tools qttools5-dev-tools libgl1-mesa-dev
- name: autogen.sh
run: ./autogen.sh
- name: configure
run: CC=clang CXX=clang++ ./configure
- name: make
run: make
- name: make install
run: sudo make install

linux-make:
name: Makefile.generic (Linux, GCC)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt update
sudo apt install autoconf automake make gcc g++ qtbase5-dev qtbase5-dev-tools qttools5-dev-tools libgl1-mesa-dev
- name: Setup
run: cp config.h.generic config.h
- name: make
run: make -f Makefile.generic
- name: make install
run: sudo make -f Makefile.generic install

linux-flatpak:
name: Flatpak (Linux, GCC)
# flatpak-builder fails to download glu on ubuntu-22.04
# (glu specified in mm3d-flatpak.yml)
# see https://github.com/flatpak/flatpak-builder/issues/468
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # This is needed for "git describe" to work.
- name: Install Dependencies
run: |
sudo apt update
sudo apt install flatpak flatpak-builder
flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
- name: Set version for the Flatpak
run: |
# if not a tag, add version
if [ $(git describe) != $(git describe --abbrev=0) ]; then
sed -i "s|<releases>|<releases>\n <release version=\"$(git describe|sed 's/^v\([0-9]\)/\1/')\" date=\"$(git show -s --pretty=format:%ad --date=short)\" />|" desktop/moe.clover.mm3d.metainfo.xml
fi
cat desktop/moe.clover.mm3d.metainfo.xml
- name: flatpak-builder
run: flatpak-builder --user --install-deps-from=flathub --repo=flatpak-repo --state-dir=flatpak-state flatpak-build mm3d-flatpak.yaml
- name: flatpak build-bundle
run: flatpak build-bundle flatpak-repo moe.clover.mm3d-$(git describe|sed 's/^v\([0-9]\)/\1/').flatpak moe.clover.mm3d
- name: flatpak install
run: |
flatpak install --user -y moe.clover.mm3d-$(git describe|sed 's/^v\([0-9]\)/\1/').flatpak
flatpak list
- uses: actions/upload-artifact@v4
with:
name: Flatpak Bundle
path: ./*.flatpak

macOS:
name: macOS
runs-on: macOS-latest
name: macOS (x86_64)
runs-on: macos-latest-large
steps:
- uses: actions/checkout@v4
with:
Expand Down

0 comments on commit d6c265a

Please sign in to comment.