diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5fd9c8f..71b835b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v1 - name: OpenSSL OSX if: runner.os == 'macOS' @@ -56,7 +56,7 @@ jobs: if: startsWith(matrix.build, 'gui') && runner.os != 'Linux' uses: jurplel/install-qt-action@v3 with: - version: '5.15.2' + version: '5.11.0' - name: Configure shell: bash diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 30106ea..bf92e1f 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -12,25 +12,25 @@ 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 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}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v1 - name: Qt if: startsWith(matrix.component, 'gui') shell: bash run: | 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 id: package @@ -54,51 +54,32 @@ jobs: rpm: strategy: matrix: - 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: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 + container: [ "fedora:36" ] 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.name}} (${{matrix.component}}) + name: RPM ${{matrix.container}} (${{matrix.component}}) runs-on: ubuntu-latest - container: ${{ matrix.container.name }} + container: ${{ matrix.container}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v1 - name: Dependancies 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 if: startsWith(matrix.component, 'gui') shell: bash run: | - sudo dnf install -y ${{ matrix.container.qt }} + sudo dnf install -y qt5-qtbase-devel-5.15.3-1.fc36.x86_64 - name: Package id: package @@ -131,7 +112,7 @@ jobs: name: Windows (${{matrix.arch}}) runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v1 - name: Qt uses: jurplel/install-qt-action@v3 @@ -147,8 +128,8 @@ jobs: run: | cmake --build build --config Release --target package $FILE=(ls build/*.exe) - echo "filename=$FILE" >> "$GITHUB_OUTPUT" - echo "name=$(([io.fileinfo]"$FILE").basename)" >> "$GITHUB_OUTPUT" + echo "::set-output name=filename::$FILE" + echo "::set-output name=name::$(([io.fileinfo]"$FILE").basename).exe" - name: Upload uses: actions/upload-release-asset@v1 diff --git a/README.md b/README.md index 5609aa3..20a5875 100644 --- a/README.md +++ b/README.md @@ -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) [![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. 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 diff --git a/common/cmake/libantelope.cmake b/common/cmake/libantelope.cmake index 85a0ccd..f70330b 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.2 ) +set( LIBANTELOPE_WANTED_VERSION v0.2.0 ) # -------------------------------- # Macros