Skip to content

Commit

Permalink
Version 1.5.22 release
Browse files Browse the repository at this point in the history
- Build and release Windows binaries using GitHub actions
- Remove AppVeyor build support
- Submodules update
  • Loading branch information
CoolmanCZ committed Oct 23, 2024
1 parent 86cab63 commit 687b9e7
Show file tree
Hide file tree
Showing 7 changed files with 123 additions and 132 deletions.
122 changes: 0 additions & 122 deletions .appveyor.yml

This file was deleted.

112 changes: 112 additions & 0 deletions .github/workflows/rajce.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
name: Rajce CMake build

on:
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'

env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: 'Release'

jobs:
build:
strategy:
matrix:
include:
- { sys: mingw32, APP_BIT: '32bit' }
- { sys: mingw64, APP_BIT: '64bit' }

runs-on: windows-latest

outputs:
APP_VERSION: ${{steps.version.outputs.APP_VERSION}}

env:
BUILD_DIR: build.${{matrix.sys}}
ROOT_DIR: ${{github.workspace}}

steps:
- name: Checkout git repository
uses: actions/checkout@v4
with:
submodules: true

- name: Generate CMakeLists files
shell: bash
run: ./GenerateCMakeFiles.sh

- name: Setup MSYS2
uses: msys2/setup-msys2@v2
with:
msystem: ${{matrix.sys}}
pacboy: >-
toolchain:p
cmake:p
ninja:p
- name: Build binary
shell: msys2 {0}
run: |
cmake -G Ninja -B ${{env.BUILD_DIR}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
cmake --build ${{env.BUILD_DIR}}
- name: Parse version file
shell: bash
run: echo "APP_VERSION=$(grep '#define APP_VERSION_STR' '${{env.ROOT_DIR}}/app/Rajce/Version.h' | sed -e 's/.*"\([0-9\.]*\)".*/\1/')" >> "$GITHUB_ENV"

- name: Export version information
id: version
shell: bash
run: echo "APP_VERSION=${{env.APP_VERSION}}" >> "$GITHUB_OUTPUT"

- name: Create source archive
if: matrix.sys == 'mingw32'
shell: bash
run: |
dir
mv "${{env.ROOT_DIR}}/Rajce.upp.tar.bz2" "${{env.ROOT_DIR}}/Rajce.upp-${{env.APP_VERSION}}.tar.bz2"
sha256sum "${{env.ROOT_DIR}}/Rajce.upp-${{env.APP_VERSION}}.tar.bz2" > "${{env.ROOT_DIR}}/Rajce.upp-${{env.APP_VERSION}}.tar.bz2.sha256"
- name: Create binary archive
shell: bash
run: |
cp "${{env.ROOT_DIR}}/app/Rajce/Copying" "${{env.BUILD_DIR}}/bin/LICENSE"
7z a "${{env.ROOT_DIR}}/rajce-${{env.APP_VERSION}}-${{matrix.APP_BIT}}.zip" "./${{env.BUILD_DIR}}/bin/*"
sha256sum "${{env.ROOT_DIR}}/rajce-${{env.APP_VERSION}}-${{matrix.APP_BIT}}.zip" > "${{env.ROOT_DIR}}/rajce-${{env.APP_VERSION}}-${{matrix.APP_BIT}}.zip.sha256"
- name: Store archives
uses: actions/upload-artifact@v4
with:
name: ${{matrix.sys}}-archives
if-no-files-found: ignore
path: |
${{env.ROOT_DIR}}/Rajce.upp-${{env.APP_VERSION}}.tar.bz2
${{env.ROOT_DIR}}/Rajce.upp-${{env.APP_VERSION}}.tar.bz2.sha256
${{env.ROOT_DIR}}/rajce-${{env.APP_VERSION}}-${{matrix.APP_BIT}}.zip
${{env.ROOT_DIR}}/rajce-${{env.APP_VERSION}}-${{matrix.APP_BIT}}.zip.sha256
release:
needs: build

runs-on: ubuntu-latest

env:
APP_VERSION: ${{needs.build.outputs.APP_VERSION}}

steps:
- name: Retrieve archives
uses: actions/download-artifact@v4
with:
path: archives
merge-multiple: true

- name: Create release
uses: svenstaro/upload-release-action@v2
with:
release_name: 'v${{env.APP_VERSION}}'
target_commit: ${{github.sha}}
body: ${{ github.event.head_commit.message }}
file: archives/*
file_glob: true

4 changes: 2 additions & 2 deletions GenerateCMakeFiles.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2016-2023 Radek Malcic
# Copyright (C) 2016-2024 Radek Malcic
#
# All rights reserved.
#
Expand Down Expand Up @@ -36,7 +36,7 @@ GENERATE_PACKAGE="1" # set to "1" - create a tarball package of the proje

#GENERATE_NOT_Cxx="1" # set to "1" - do not use compiler -std=c++14 parameter (compiler parameter is enabled as default)
#GENERATE_NOT_PARALLEL="1" # set to "1" - do not build with multiple processes (parralel build is enabled as default)
#GENERATE_NOT_PCH="1" # set to "1" - do not build with precompiled header support (precompiled header support is enabled as default)
GENERATE_NOT_PCH="1" # set to "1" - do not build with precompiled header support (precompiled header support is enabled as default)
if [ "${OS}" == "SunOS" ]; then
GENERATE_NOT_REMOVE_UNUSED_CODE="1" # set to "1" - do not use compile and link parameters to remove unused code and functions (unused code and functions are removed as default)
fi
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ Rajce album downloader is the U++ GUI application to retrieve images/videos from

[U++](http://www.ultimatepp.org/) is a C++ cross-platform rapid application development framework focused on programmers productivity. It includes a set of libraries (GUI, SQL, etc.), and an integrated development environment.

# AppVeyor build status
# GitHub actions build status

[AppVeyor](https://www.appveyor.com) is used to build Windows binaries and deploy them to the GitHub releases directory.
[GitHub actions](https://docs.github.com/en/actions) is used to build Windows binaries and deploy them to the GitHub releases directory.

|branch | status|
|--- |--- |
|master |[![Build status](https://ci.appveyor.com/api/projects/status/github/CoolmanCZ/rajce?svg=true)](https://ci.appveyor.com/project/CoolmanCZ/rajce)|
|master |[![Build status](https://github.com/CoolmanCZ/rajce/actions/workflows/rajce.yml/badge.svg?branch=master)](https://github.com/CoolmanCZ/rajce/actions/workflows/rajce.yml)|

*The Windows executable is currently not signed, which will show a warning when you run the .exe. Press 'more info' -> 'run anyway' to skip the warning.*

Expand Down Expand Up @@ -45,6 +45,7 @@ Download latest windows binaries and source code from [GitHub releases](https://

# Changelog

* 1.5.22 - Build and release Windows binaries using GitHub actions
* 1.5.21 - Submodules update to fix build error
* 1.5.20 - Option to continue with download in case of error 404 Not Found
* 1.5.19 - Enable append of album user name to the download directory for authorized album only
Expand Down
2 changes: 1 addition & 1 deletion app/Rajce/Copying
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Copyright (C) 2016-2023 Radek Malcic
Copyright (C) 2016-2024 Radek Malcic

All rights reserved.

Expand Down
6 changes: 3 additions & 3 deletions app/Rajce/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@

#define APP_NAME "Rajce"
#define APP_TITLE "Rajce album downloader"
#define APP_COPYRIGHT "Copyright (c) 2016-2023"
#define APP_COPYRIGHT "Copyright (c) 2016-2024"

#define APP_MAJOR_VER 1
#define APP_MINOR_VER 5
#define APP_PATCH_VER 21
#define APP_PATCH_VER 22
#define APP_BUILD_VER 0

#define APP_VERSION_STR "1.5.21"
#define APP_VERSION_STR "1.5.22"
#define APP_VERSION_NUM TO_NUMBER(APP_MAJOR_VER, APP_MINOR_VER, APP_PATCH_VER, APP_BUILD_VER)

#define APP_FILEVERSION APP_MAJOR_VER, APP_MINOR_VER, APP_PATCH_VER, APP_BUILD_VER
Expand Down
2 changes: 1 addition & 1 deletion upp_cmake

0 comments on commit 687b9e7

Please sign in to comment.