Skip to content

Commit

Permalink
Merge pull request #54 from Bollos00/dev2
Browse files Browse the repository at this point in the history
Changes to version 2.0.0
  • Loading branch information
Bollos00 authored Feb 24, 2024
2 parents fe9c638 + ead3589 commit 4a5ef0a
Show file tree
Hide file tree
Showing 476 changed files with 1,901 additions and 6,756 deletions.
48 changes: 48 additions & 0 deletions .github/workflows/arch-latest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Arch Build

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ master ]
pull_request:
branches: [ master ]
# Allows you to run this workflow manually from the Actions tab
# workflow_dispatch:

# env:
# # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
# BUILD_TYPE: Release


# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:

build:
runs-on: ubuntu-latest
container:
image: archlinux:latest
options: --privileged
steps:
- uses: actions/checkout@v4

- name: "Install dependencies"
run: "pacman -Syu --noconfirm base-devel qt6-base qt6-svg qt6-multimedia cmake"

- name: "Create build directory and run CMake"
run: "mkdir build && cd build && \
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr .."

- name: "Build"
run: "cd build && make"

- name: Prepare build artifacts
run: |
cd build && make DESTDIR=install ./install
cp ../LICENSE ../README.md ./install/usr/share/libremines
- name: Upload build artifacts
uses: actions/upload-artifact@v4
with:
name: libremines-build-archlinux-latest
path: build/install
83 changes: 0 additions & 83 deletions .github/workflows/build.yml

This file was deleted.

61 changes: 61 additions & 0 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Ubuntu Build

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ master ]
pull_request:
branches: [ master ]
# Allows you to run this workflow manually from the Actions tab
# workflow_dispatch:

# env:
# # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
# BUILD_TYPE: Release


# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
build:
strategy:
matrix:
os: [ ubuntu-20.04, ubuntu-22.04 ]

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

steps:
- uses: actions/checkout@v4

- name: "Apt update"
run: "sudo apt-get update"

- name: "Install dependencies Ubuntu 20.04"
if: matrix.os == 'ubuntu-20.04'
run: "sudo apt-get install build-essential qt5-default cmake libqt5svg5-dev qtmultimedia5-dev"
- name: "Install dependencies Ubuntu 22.04"
if: matrix.os == 'ubuntu-22.04'
run: "sudo apt-get install build-essential qt6-base-dev cmake libqt6svg6-dev qt6-multimedia-dev libgl1-mesa-dev"

- name: "Create build directory and run CMake Ubuntu 20.04"
if: matrix.os == 'ubuntu-20.04'
run: "mkdir build && cd build && \
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT6='NO' .."
- name: "Create build directory and run CMake Ubuntu 22.04"
if: matrix.os == 'ubuntu-22.04'
run: "mkdir build && cd build && \
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr .."

- name: "Build"
run: "cd build && make"

- name: Prepare build artifacts
run: |
cd build && make DESTDIR=install ./install
cp ../LICENSE ../README.md ./install/usr/share/libremines
- name: Upload build artifacts
uses: actions/upload-artifact@v4
with:
name: libremines-build-${{ matrix.os }}
path: build/install
86 changes: 86 additions & 0 deletions .github/workflows/windows-latest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
name: Windows Build

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ master ]
pull_request:
branches: [ master ]
# Allows you to run this workflow manually from the Actions tab
# workflow_dispatch:

# env:
# # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
# BUILD_TYPE: Release


# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
build:
runs-on: windows-2022

strategy:
matrix:
qt-version: [ '5.15.2', '6.5.3' ]

steps:
- uses: actions/checkout@v4

- name: "Install Qt 5.15.2"
if: matrix.qt-version == '5.15.2'
uses: jurplel/install-qt-action@v3
with:
version: '5.15.2'
host: 'windows'
dir: '${{ github.workspace }}'
# modules: 'qtsvg'
arch: 'win64_msvc2019_64'
set-env: 'true'
setup-python: 'true'

- name: "Install Qt 6.5.3"
if: matrix.qt-version == '6.5.3'
uses: jurplel/install-qt-action@v3
with:
version: '6.5.3'
host: 'windows'
dir: '${{ github.workspace }}'
modules: 'qtmultimedia'
arch: 'win64_msvc2019_64'
set-env: 'true'
setup-python: 'true'

- name: "Create build directory and run CMake Qt 6.5.3"
if: matrix.qt-version == '6.5.3'
run: "mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .."

- name: "Create build directory and run CMake Qt 5.15.2"
if: matrix.qt-version == '5.15.2'
run: "mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_QT6='NO' .."

- name: "Build"
run: "cd build && cmake --build . --config Release"

- name: Prepare build artifacts
run: |
Set-Location ./build
${{ github.workspace }}/Qt/${{ matrix.qt-version}}/msvc2019_64/bin/windeployqt.exe --no-translations ./Release
Copy-Item ../README.md ./Release
Copy-Item ../LICENSE ./Release
New-Item -ItemType Directory ./Release/minefield_extra_themes
Copy-Item ../share/minefield_themes/alternative_dark ./Release/minefield_extra_themes -Recurse
Copy-Item ../share/minefield_themes/alternative_light ./Release/minefield_extra_themes -Recurse
Copy-Item ../share/minefield_themes/flowerfield ./Release/minefield_extra_themes -Recurse
Copy-Item ../share/minefield_themes/twemoji ./Release/minefield_extra_themes -Recurse
New-Item -ItemType Directory ./Release/facesreaction_extra_themes
Copy-Item ../share/faces_reaction/open-emoji-black ./Release/facesreaction_extra_themes -Recurse
Copy-Item ../share/faces_reaction/open-emoji-white ./Release/facesreaction_extra_themes -Recurse
Copy-Item ../share/faces_reaction/twemoji-color ./Release/facesreaction_extra_themes -Recurse
Copy-Item ../share/faces_reaction/SecularSteve_custom ./Release/facesreaction_extra_themes -Recurse
- name: Upload build artifacts
uses: actions/upload-artifact@v4
with:
name: libremines-build-windows-qt-${{ matrix.qt-version }}
path: build/Release
Loading

0 comments on commit 4a5ef0a

Please sign in to comment.