aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix (xq) Queißner <git@mq32.de>2021-03-06 18:55:46 +0100
committerFelix (xq) Queißner <git@mq32.de>2021-03-06 18:55:46 +0100
commit0785c1cf3826bbdaa36cd7c94e80913decf86818 (patch)
treede8626707f2a8152443d12cdff09dcf5baa5dc8a
parentc4135b9752044a056d93469e8af8eb25f6d5ca78 (diff)
downloadkristall-0785c1cf3826bbdaa36cd7c94e80913decf86818.tar.gz
More CI. Fixes wrong brew package name.
-rw-r--r--.github/workflows/build.yml9
-rw-r--r--BUILDING.md2
2 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 797d45a..db284e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,7 +47,8 @@ jobs:
run: make build/kristall
- name: Prepare deployment
- run: macdeployqt build/kristall.app
+ working-directory: build
+ run: macdeployqt kristall.app -dmg
- name: display
run: |
@@ -58,13 +59,13 @@ jobs:
- uses: actions/upload-artifact@v2
with:
name: Kristall.app
- path: build/kristall.app
+ path: build/kristall.dmg
- name: Deploy with SCP
uses: noobly314/deploy-with-scp@v1
with:
- src: build/kristall.app
- dest: kristall/Kristall-nightly-macos-x86_64.app
+ src: build/kristall.dmg
+ dest: kristall/Kristall-nightly-macos-x86_64.dmg
username: generic-ci
server-ip: random-projects.net
ssh-key: ${{ secrets.PRIVATE_KEY }} #
diff --git a/BUILDING.md b/BUILDING.md
index a142940..b6f6dc2 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -123,7 +123,7 @@ Use QtCreator to build `./src/kristall.pro` with default settings.
#### macOS
-1. Run `brew install qt openssl` to install the `qt` and `openssl` packages with [Homebrew](https://brew.sh/).
+1. Run `brew install qt@5 openssl` to install the `qt` and `openssl` packages with [Homebrew](https://brew.sh/).
2. Run `make build/kristall` to build `kristall.app` in the `build` directory.
#### Haiku