From 83f09d494c38722cc1aa6457b85e452246f1f347 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Wed, 31 May 2023 19:21:05 +0200 Subject: [PATCH 01/13] common/cmake/libantelope.cmake: use version 0.2.1 --- common/cmake/libantelope.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cmake/libantelope.cmake b/common/cmake/libantelope.cmake index f70330b..ef6aada 100644 --- a/common/cmake/libantelope.cmake +++ b/common/cmake/libantelope.cmake @@ -2,7 +2,7 @@ # Variables # -------------------------------- set( LIBANTELOPE_GIT_URL "https://github.com/eosswedenorg/libantelope.git" ) -set( LIBANTELOPE_WANTED_VERSION v0.2.0 ) +set( LIBANTELOPE_WANTED_VERSION v0.2.1 ) # -------------------------------- # Macros From 1c4e01a7267ac3e1ce447d38c114eae9e560d472 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Wed, 5 Jul 2023 05:00:01 +0200 Subject: [PATCH 02/13] README.md: Fix link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 20a5875..bf10612 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ You will need `libantelope` and `cmake 3.15` or later to compile this project. **NOTE:** Only Ubuntu 20.04 and 22.04 and Fedoora 36 is officially supported. The project should compile fine on most versions/distros but it is only tested -and distributed for those distros/versions by [Sw/eden](www.eossweden.org). +and distributed for those distros/versions by [Sw/eden](http://www.eossweden.org). #### Dependencies From baaf7e5b5417ccb5edb279e592d43b9d941af914 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Wed, 16 Aug 2023 16:00:10 +0200 Subject: [PATCH 03/13] common/cmake/libantelope.cmake: Use version 0.2.2 --- common/cmake/libantelope.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cmake/libantelope.cmake b/common/cmake/libantelope.cmake index ef6aada..85a0ccd 100644 --- a/common/cmake/libantelope.cmake +++ b/common/cmake/libantelope.cmake @@ -2,7 +2,7 @@ # Variables # -------------------------------- set( LIBANTELOPE_GIT_URL "https://github.com/eosswedenorg/libantelope.git" ) -set( LIBANTELOPE_WANTED_VERSION v0.2.1 ) +set( LIBANTELOPE_WANTED_VERSION v0.2.2 ) # -------------------------------- # Macros From ad5d46479263edb7b35a334d5bc44f41bfd75dce Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Wed, 16 Aug 2023 18:38:17 +0200 Subject: [PATCH 04/13] .github/workflows/package.yml: Update actions/checkout to version 3 --- .github/workflows/package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index bf92e1f..5698798 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -19,7 +19,7 @@ jobs: name: DBM ${{matrix.os}} (${{matrix.component}}) runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Qt if: startsWith(matrix.component, 'gui') @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest container: ${{ matrix.container}} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Dependancies run: | @@ -112,7 +112,7 @@ jobs: name: Windows (${{matrix.arch}}) runs-on: windows-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Qt uses: jurplel/install-qt-action@v3 From 1ef34246380908a0b5e8096b3fead5f095f3bb5e Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Wed, 16 Aug 2023 18:44:39 +0200 Subject: [PATCH 05/13] .github/workflows/ci.yml: Update qt version for windows/mac to 5.15.2 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71b835b..3a15317 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: if: startsWith(matrix.build, 'gui') && runner.os != 'Linux' uses: jurplel/install-qt-action@v3 with: - version: '5.11.0' + version: '5.15.2' - name: Configure shell: bash From 53644e9ceb3ff066c54a9fef2710134ed845c854 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Wed, 16 Aug 2023 18:51:45 +0200 Subject: [PATCH 06/13] .github/workflows/ci.yml: update actions/checkout to version 3. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a15317..5fd9c8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: OpenSSL OSX if: runner.os == 'macOS' From 772d03a6e3840e324587ac420fca8787eca7cdb2 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Wed, 16 Aug 2023 18:57:33 +0200 Subject: [PATCH 07/13] .github/workflows/package.yml: Typofix, change "DBM" to "DEB" --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 5698798..1663a3e 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -16,7 +16,7 @@ jobs: build-opts: --cli --no-gui -t Release --pkg-type deb - component: gui build-opts: --no-cli --gui -t Release --pkg-type deb - name: DBM ${{matrix.os}} (${{matrix.component}}) + name: DEB ${{matrix.os}} (${{matrix.component}}) runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v3 From d03d27589e2760ee620a6a98492fb202c59a6102 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Wed, 16 Aug 2023 17:24:12 +0200 Subject: [PATCH 08/13] .github/workflows/package.yml: build and package for fedora 38 --- .github/workflows/package.yml | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 1663a3e..fc409df 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -54,32 +54,43 @@ jobs: rpm: strategy: matrix: - container: [ "fedora:36" ] + container: + - name: "fedora:36" + deps: + gcc-12.2.1-4.fc36.x86_64 + gcc-c++-12.2.1-4.fc36.x86_64 + cmake-3.26.3-1.fc36.x86_64 + openssl1.1-devel-1.1.1q-1.fc36.x86_64 + qt: qt5-qtbase-devel-5.15.3-1.fc36.x86_64 + + - name: "fedora:38" + deps: + gcc-13.2.1-1.fc38.x86_64 + gcc-c++-13.2.1-1.fc38.x86_64 + cmake-3.26.2-1.fc38.x86_64 + openssl-devel-1:3.0.9-2.fc38.x86_64 + qt: qt5-qtbase-devel-5.15.10-1.fc38.x86_64 component: [ cli, gui ] include: - component: cli build-opts: --cli --no-gui -t Release --pkg-type rpm - component: gui build-opts: --no-cli --gui -t Release --pkg-type rpm - name: RPM ${{matrix.container}} (${{matrix.component}}) + name: RPM ${{matrix.container.name}} (${{matrix.component}}) runs-on: ubuntu-latest - container: ${{ matrix.container}} + container: ${{ matrix.container.name }} steps: - uses: actions/checkout@v3 - name: Dependancies run: | - sudo dnf install -y util-linux rpmdevtools git \ - gcc-12.2.1-4.fc36.x86_64 \ - gcc-c++-12.2.1-4.fc36.x86_64 \ - cmake-3.26.3-1.fc36.x86_64 \ - openssl1.1-devel-1.1.1q-1.fc36.x86_64 + sudo dnf install -y util-linux rpmdevtools git ${{ matrix.container.deps }} - name: Qt if: startsWith(matrix.component, 'gui') shell: bash run: | - sudo dnf install -y qt5-qtbase-devel-5.15.3-1.fc36.x86_64 + sudo dnf install -y ${{ matrix.container.qt }} - name: Package id: package From 2874862d704c0d9756aed1e453e7652f7f24eabf Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Thu, 17 Aug 2023 16:55:05 +0200 Subject: [PATCH 09/13] .github/workflows/package.yml: Package for fedora 37 --- .github/workflows/package.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index fc409df..e2609f5 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -63,6 +63,14 @@ jobs: openssl1.1-devel-1.1.1q-1.fc36.x86_64 qt: qt5-qtbase-devel-5.15.3-1.fc36.x86_64 + - name: "fedora:37" + deps: + gcc-12.3.1-1.fc37.x86_64 + gcc-c++-12.3.1-1.fc37.x86_64 + cmake-3.27.1-1.fc37.x86_64 + openssl-devel-3.0.9-1.fc37.x86_64 + qt: qt5-qtbase-devel-5.15.9-3.fc37.x86_64 + - name: "fedora:38" deps: gcc-13.2.1-1.fc38.x86_64 From 8949a80b1164f65ec14e3ef05298bfb79d93127f Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Thu, 17 Aug 2023 17:14:26 +0200 Subject: [PATCH 10/13] .github/workflows/package.yml: set-output command to environment variables. --- .github/workflows/package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index e2609f5..48dd58c 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -147,8 +147,8 @@ jobs: run: | cmake --build build --config Release --target package $FILE=(ls build/*.exe) - echo "::set-output name=filename::$FILE" - echo "::set-output name=name::$(([io.fileinfo]"$FILE").basename).exe" + echo "filename=$FILE" >> "$GITHUB_OUTPUT" + echo "name=$(([io.fileinfo]"$FILE").basename)" >> "$GITHUB_OUTPUT" - name: Upload uses: actions/upload-release-asset@v1 From 7e8b1d6e664a423ffae337bba10d127498b587e1 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Fri, 25 Aug 2023 12:38:34 +0200 Subject: [PATCH 11/13] README.md: fix link to CI tests. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bf10612..5609aa3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -![](https://github.com/eosswedenorg/antelope-keygen/workflows/CI/badge.svg) +[![CI Test](https://github.com/eosswedenorg/antelope-keygen/workflows/CI/badge.svg)](https://github.com/eosswedenorg/antelope-keygen/actions) [![GitHub release](https://img.shields.io/github/v/release/eosswedenorg/antelope-keygen?include_prereleases)](https://github.com/eosswedenorg/antelope-keygen/releases/latest) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) From 24136406a75a2661dfa16d0e33ec6c2158533229 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Fri, 25 Aug 2023 12:41:19 +0200 Subject: [PATCH 12/13] .github/workflows/package.yml: for ubuntu, use matrix includes for qt package instead of the if/else in bash. --- .github/workflows/package.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 48dd58c..3c5f738 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -12,6 +12,10 @@ jobs: os: [ ubuntu-20.04, ubuntu-22.04 ] component: [ cli, gui ] include: + - os: ubuntu-20.04 + qt: qt5-default=5.12.8+dfsg-0ubuntu2.1 + - os: ubuntu-22.04 + qt: qtbase5-dev=5.15.3+dfsg-2ubuntu0.2 - component: cli build-opts: --cli --no-gui -t Release --pkg-type deb - component: gui @@ -26,11 +30,7 @@ jobs: shell: bash run: | sudo apt-get update - if [ "${{matrix.os}}" == "ubuntu-22.04" ]; then - sudo apt-get install qtbase5-dev=5.15.3+dfsg-2ubuntu0.2 - else : - sudo apt-get install qt5-default=5.12.8+dfsg-0ubuntu2.1 - fi + sudo apt-get install ${{matrix.qt}} - name: Package id: package From 6c4769a0303cd40778b031360c96da1d0636deac Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 27 Aug 2023 14:19:35 +0200 Subject: [PATCH 13/13] .github/workflows/package.yml: fix qt5 package for fedora 38 --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 3c5f738..30106ea 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -77,7 +77,7 @@ jobs: gcc-c++-13.2.1-1.fc38.x86_64 cmake-3.26.2-1.fc38.x86_64 openssl-devel-1:3.0.9-2.fc38.x86_64 - qt: qt5-qtbase-devel-5.15.10-1.fc38.x86_64 + qt: qt5-qtbase-devel-5.15.10-5.fc38.x86_64 component: [ cli, gui ] include: - component: cli