summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/build.yml17
-rw-r--r--.gitignore1
-rw-r--r--README.md4
-rw-r--r--appveyor.yml28
4 files changed, 13 insertions, 37 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d4c38ad..217b769 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- name: [macos-clang, ubuntu-20.04-clang, ubuntu-18.04-g++, ubuntu-20.04-g++]
+ name: [macos-clang, ubuntu-20.04-clang, ubuntu-20.04-g++, ubuntu-22.04-clang, ubuntu-22.04-g++]
qt_ver: [5.12.0, 5.15.1]
include:
- name: macos-clang
@@ -28,13 +28,18 @@ jobs:
env:
CXX: clang++
CC: clang
- - name: ubuntu-18.04-g++
- os: ubuntu-18.04
+ - name: ubuntu-20.04-g++
+ os: ubuntu-20.04
env:
CXX: g++
CC: gcc
- - name: ubuntu-20.04-g++
- os: ubuntu-20.04
+ - name: ubuntu-22.04-clang
+ os: ubuntu-22.04
+ env:
+ CXX: clang++
+ CC: clang
+ - name: ubuntu-22.04-g++
+ os: ubuntu-22.04
env:
CXX: g++
CC: gcc
@@ -82,7 +87,7 @@ jobs:
id: cache-qt
uses: actions/cache@v3
with:
- path: ../Qt
+ path: Qt
key: ${{ runner.os }}-${{ matrix.qt_ver }}-${{ matrix.qt_arch }}-Qt-cache
- name: Install Qt
diff --git a/.gitignore b/.gitignore
index bca0c43..49b3592 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
.sconsign
+.cache
.gitattributes
.tags*
.qmake.stash
diff --git a/README.md b/README.md
index fcae586..b515c24 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,7 @@
Quackle ![Icon](https://github.com/quackle/quackle/raw/master/IconSmall.png)
=======
-![GitHub Actions CI build](https://github.com/quackle/quackle/actions/workflows/build.yml/badge.svg)
-[![AppVeyor build status](https://ci.appveyor.com/api/projects/status/ttcu5vruvcdljwel/branch/master?svg=true)](https://ci.appveyor.com/project/jfultz/quackle/branch/master)
-[![CI builds](https://github.com/quackle/quackle/workflows/CI%20builds/badge.svg)](https://github.com/quackle/quackle/actions?query=workflow%3A%22CI+Builds%22+event%3Apush)
+[![CI builds](https://github.com/quackle/quackle/actions/workflows/build.yml/badge.svg)](https://github.com/quackle/quackle/actions/workflows/build.yml)
Crossword game artificial intelligence and analysis tool.
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 1d88259..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-version: '{build}'
-
-environment:
- matrix:
- - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
- QMAKE: C:\Qt\5.9\msvc2017_64\bin\qmake.exe
- VCVARS_SCRIPT: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat"
- VCVARS_PLATFORM: amd64
- - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
- QMAKE: C:\Qt\5.9\msvc2015\bin\qmake.exe
- VCVARS_SCRIPT: "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat"
- VCVARS_PLATFORM: x86
-
-init:
- - cmd: |
- "%VCVARS_SCRIPT%" %VCVARS_PLATFORM%
- %QMAKE% --version
-
-build_script:
-- cmd: |
- %QMAKE%
- nmake /nologo release
- cd quackleio
- %QMAKE%
- nmake /nologo release
- cd ../quacker
- %QMAKE%
- nmake /nologo release