1
0
Fork 0
mirror of https://github.com/eosswedenorg/antelope-keygen synced 2026-06-16 03:44:56 +02:00

Compare commits

..

No commits in common. "develop" and "v1.1.0" have entirely different histories.

4 changed files with 25 additions and 44 deletions

View file

@ -34,7 +34,7 @@ jobs:
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v1
- name: OpenSSL OSX - name: OpenSSL OSX
if: runner.os == 'macOS' if: runner.os == 'macOS'
@ -56,7 +56,7 @@ jobs:
if: startsWith(matrix.build, 'gui') && runner.os != 'Linux' if: startsWith(matrix.build, 'gui') && runner.os != 'Linux'
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3
with: with:
version: '5.15.2' version: '5.11.0'
- name: Configure - name: Configure
shell: bash shell: bash

View file

@ -12,25 +12,25 @@ jobs:
os: [ ubuntu-20.04, ubuntu-22.04 ] os: [ ubuntu-20.04, ubuntu-22.04 ]
component: [ cli, gui ] component: [ cli, gui ]
include: 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 - component: cli
build-opts: --cli --no-gui -t Release --pkg-type deb build-opts: --cli --no-gui -t Release --pkg-type deb
- component: gui - component: gui
build-opts: --no-cli --gui -t Release --pkg-type deb build-opts: --no-cli --gui -t Release --pkg-type deb
name: DEB ${{matrix.os}} (${{matrix.component}}) name: DBM ${{matrix.os}} (${{matrix.component}})
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v1
- name: Qt - name: Qt
if: startsWith(matrix.component, 'gui') if: startsWith(matrix.component, 'gui')
shell: bash shell: bash
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install ${{matrix.qt}} 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
- name: Package - name: Package
id: package id: package
@ -54,51 +54,32 @@ jobs:
rpm: rpm:
strategy: strategy:
matrix: matrix:
container: container: [ "fedora:36" ]
- 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: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
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-5.fc38.x86_64
component: [ cli, gui ] component: [ cli, gui ]
include: include:
- component: cli - component: cli
build-opts: --cli --no-gui -t Release --pkg-type rpm build-opts: --cli --no-gui -t Release --pkg-type rpm
- component: gui - component: gui
build-opts: --no-cli --gui -t Release --pkg-type rpm build-opts: --no-cli --gui -t Release --pkg-type rpm
name: RPM ${{matrix.container.name}} (${{matrix.component}}) name: RPM ${{matrix.container}} (${{matrix.component}})
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: ${{ matrix.container.name }} container: ${{ matrix.container}}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v1
- name: Dependancies - name: Dependancies
run: | run: |
sudo dnf install -y util-linux rpmdevtools git ${{ matrix.container.deps }} 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
- name: Qt - name: Qt
if: startsWith(matrix.component, 'gui') if: startsWith(matrix.component, 'gui')
shell: bash shell: bash
run: | run: |
sudo dnf install -y ${{ matrix.container.qt }} sudo dnf install -y qt5-qtbase-devel-5.15.3-1.fc36.x86_64
- name: Package - name: Package
id: package id: package
@ -131,7 +112,7 @@ jobs:
name: Windows (${{matrix.arch}}) name: Windows (${{matrix.arch}})
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v1
- name: Qt - name: Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3
@ -147,8 +128,8 @@ jobs:
run: | run: |
cmake --build build --config Release --target package cmake --build build --config Release --target package
$FILE=(ls build/*.exe) $FILE=(ls build/*.exe)
echo "filename=$FILE" >> "$GITHUB_OUTPUT" echo "::set-output name=filename::$FILE"
echo "name=$(([io.fileinfo]"$FILE").basename)" >> "$GITHUB_OUTPUT" echo "::set-output name=name::$(([io.fileinfo]"$FILE").basename).exe"
- name: Upload - name: Upload
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1

View file

@ -1,5 +1,5 @@
[![CI Test](https://github.com/eosswedenorg/antelope-keygen/workflows/CI/badge.svg)](https://github.com/eosswedenorg/antelope-keygen/actions) ![](https://github.com/eosswedenorg/antelope-keygen/workflows/CI/badge.svg)
[![GitHub release](https://img.shields.io/github/v/release/eosswedenorg/antelope-keygen?include_prereleases)](https://github.com/eosswedenorg/antelope-keygen/releases/latest) [![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) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
@ -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. **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 The project should compile fine on most versions/distros but it is only tested
and distributed for those distros/versions by [Sw/eden](http://www.eossweden.org). and distributed for those distros/versions by [Sw/eden](www.eossweden.org).
#### Dependencies #### Dependencies

View file

@ -2,7 +2,7 @@
# Variables # Variables
# -------------------------------- # --------------------------------
set( LIBANTELOPE_GIT_URL "https://github.com/eosswedenorg/libantelope.git" ) set( LIBANTELOPE_GIT_URL "https://github.com/eosswedenorg/libantelope.git" )
set( LIBANTELOPE_WANTED_VERSION v0.2.2 ) set( LIBANTELOPE_WANTED_VERSION v0.2.0 )
# -------------------------------- # --------------------------------
# Macros # Macros