Skip to content

Commit e67bdb5

Browse files
committed
[Release v2.2.9] QArchive v2.2.9 release
This is a minor release, no need to update to this version. # Changelog * Added QARCHIVE_VERSION_STR symbolic constant to report QArchive version to the users. * Fix tests # CI/CD Changes * Added prebuilds for Windows Users, MSVC x64 builds will be uploaded to the new releases automatically. * Also upload prebuilt library of each commit to continuous tag for users to test and consume. Signed-off-by: Divya Antony J R <[email protected]>
1 parent ed558f7 commit e67bdb5

File tree

5 files changed

+30
-19
lines changed

5 files changed

+30
-19
lines changed

Diff for: .github/workflows/deploy.yml

+20-8
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,22 @@ jobs:
4848
notify:
4949
runs-on: ubuntu-latest
5050
name: Notify Qt Modules Repository
51-
needs: [windows-msvc]
51+
needs: [check, windows-msvc]
52+
if: needs.check.outputs.deploy != 'false'
5253
steps:
5354
- name: Checkout
5455
uses: actions/checkout@v4
5556

5657
- name: Trigger
5758
env:
58-
GITHUB_TOKEN: $${{ secrets.QTMODULES_TOKEN }}
59-
run: gh api repos/antony-jr/qtmodules/dispatches --raw-field event_type=qarchive
59+
GH_TOKEN: ${{ secrets.QTMODULES_TOKEN }}
60+
GITHUB_TOKEN: ${{ secrets.QTMODULES_TOKEN }}
61+
run: gh --repo antony-jr/qtmodules workflow run gh-pages
6062

6163
windows-msvc:
64+
if: "!contains(github.event.head_commit.message, '[skip builds]')"
6265
runs-on: windows-2019
6366
needs: check
64-
if: needs.check.outputs.deploy != 'false'
6567
name: windows-msvc-v${{ matrix.toolset }}-${{ matrix.arch }}-qt-${{ matrix.qt_version }}-${{ matrix.build_type }}
6668
strategy:
6769
fail-fast: false
@@ -117,13 +119,23 @@ jobs:
117119
cd ${{ github.workspace }}/output/
118120
7z a ${{ github.workspace }}/upload/windows-msvc-v${{ matrix.toolset }}-qt-${{ matrix.qt_version }}-${{ matrix.arch }}-${{ matrix.build_type }}.zip QArchive
119121
122+
- name: Upload Builds to Continuous
123+
uses: svenstaro/upload-release-action@v2
124+
with:
125+
repo_token: ${{ secrets.GITHUB_TOKEN }}
126+
file: ${{ github.workspace }}/upload/windows-msvc-v${{ matrix.toolset }}-qt-${{ matrix.qt_version }}-${{ matrix.arch }}-${{ matrix.build_type }}.zip
127+
tag: continuous
128+
overwrite: true
129+
prerelease: true
130+
release_name: "Continuous Builds"
131+
body: "Prebuilt QArchive from latest commit on master."
132+
120133
- id: upload_rel
134+
if: needs.check.outputs.deploy != 'false'
121135
name: Upload Asset
122136
working-directory: ${{ github.workspace }}/upload
123137
env:
124138
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
125-
tag: ${{ needs.check.outputs.deploy }}
139+
TAG: ${{ needs.check.outputs.deploy }}
126140
run: |
127-
gh release upload "$tag" \
128-
--repo="$GITHUB_REPOSITORY" \
129-
windows-msvc-v${{ matrix.toolset }}-qt-${{ matrix.qt_version }}-${{ matrix.arch }}-${{ matrix.build_type }}.zip
141+
gh release upload "${{ env.TAG }}" --repo "${{ github.repository }}" windows-msvc-v${{ matrix.toolset }}-qt-${{ matrix.qt_version }}-${{ matrix.arch }}-${{ matrix.build_type }}.zip

Diff for: .github/workflows/tests.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ jobs:
2727
- id: git
2828
name: Check Commit Message
2929
run: |
30-
git clone https://github.com/antony-jr/QArchive qarc
31-
cd qarc
32-
git tag > /tmp/tags.txt
33-
cd ..
34-
rm -rf qarc
35-
cat /tmp/tags.txt
30+
# Don't need tags to check if the commit message has
31+
# the special commit.
32+
echo "" > /tmp/tags.txt
3633
result=$(python3 scripts/check.py "$(git log -1 --pretty=%B)" "/tmp/tags.txt")
3734
echo "deploy=$result" >> $GITHUB_OUTPUT
3835

Diff for: CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# ---
1313

1414
CMAKE_MINIMUM_REQUIRED( VERSION 3.17)
15-
project(QArchive VERSION 2.2.7)
15+
project(QArchive VERSION 2.2.9)
1616

1717
set(CMAKE_CXX_STANDARD 11)
1818
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -63,8 +63,8 @@ else ()
6363
find_package(LibArchive REQUIRED)
6464
endif()
6565

66-
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
6766
if (NOT DEFINED QARCHIVE_QT_VERSION_MAJOR)
67+
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
6868
set(QARCHIVE_QT_VERSION_MAJOR ${QT_VERSION_MAJOR})
6969
endif()
7070

Diff for: meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project(
22
'QArchive',
33
'cpp',
4-
version: '2.2.7',
4+
version: '2.2.9',
55
license: 'BSD-3-Clause',
66
default_options: ['cpp_std=c++17'],
77
meson_version: '>=0.49.0',

Diff for: scripts/bump_version.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ sed -i 's/QArchive VERSION .*/QArchive VERSION '$QARCHIVE_VERSION'\)/' CMakeList
1515
sed -i "s/ version: .*/ version: '$QARCHIVE_VERSION',/" meson.build
1616

1717
cat > /tmp/qarchive.commit.template.txt << EOF
18-
[Release $QARCHIVE_VERSION] QArchive v$QARCHIVE_VERSION release
18+
[Release v$QARCHIVE_VERSION] QArchive v$QARCHIVE_VERSION release
1919
20-
#Changelog
20+
# Changelog
2121
2222
* Change 1
2323
* Change 2
@@ -30,7 +30,9 @@ git status
3030

3131
read -p "Do you want to commit? press any key to continue..."
3232

33+
git config --local core.commentchar ";"
3334
git commit -S -t /tmp/qarchive.commit.template.txt
35+
git config --local core.commentchar "#"
3436

3537
rm -rf /tmp/qarchive.commit.template.txt
3638

0 commit comments

Comments
 (0)