diff --git a/.github/workflows/release-appimage.yml b/.github/workflows/release-appimage.yml index d5816fec..f7e1e9d1 100644 --- a/.github/workflows/release-appimage.yml +++ b/.github/workflows/release-appimage.yml @@ -6,6 +6,9 @@ on: - 'master' - '1.*' +env: + CONTINUOUS_BUILD: ${{ github.ref_name == 'master' && true || false }} + jobs: latest-release: runs-on: ubuntu-latest @@ -17,10 +20,32 @@ jobs: fetch-depth: 0 submodules: recursive + - name: TEST + run: echo "TEST ${{ env.CONTINUOUS_BUILD }}" + + - name: Bundle sources artifacts + run: | + [[ ${{ env.CONTINUOUS_BUILD }} == true ]] && version="continuous" || version=$(git describe --tags | sed -En 's/(v[0-9\.]+)-.*/\1/p') + + cp -r . "/tmp/hotspot-${version}" + cd /tmp + + tar czf "${{ github.workspace }}/hotspot-perfparser-${version}.tar.gz" --exclude=.git "hotspot-${version}/3rdparty/perfparser" + zip -r "${{ github.workspace }}/hotspot-perfparser-${version}.zip" "hotspot-${version}/3rdparty/perfparser" -x "hotspot-${version}/3rdparty/perfparser/.git" + + tar czf "${{ github.workspace }}/hotspot-PrefixTickLabels-${version}.tar.gz" --exclude=.git "hotspot-${version}/3rdparty/PrefixTickLabels" + zip -r "${{ github.workspace }}/hotspot-PrefixTickLabels-${version}.zip" "hotspot-${version}/3rdparty/PrefixTickLabels" -x "hotspot-${version}/3rdparty/PrefixTickLabels/.git" + + tar czf "${{ github.workspace }}/hotspot-${version}.tar.gz" --exclude=".git,perfparser,PrefixTickLabels" "hotspot-${version}" + zip -r "${{ github.workspace }}/hotspot-${version}.zip" "hotspot-${version}" -x "hotspot-${version}/3rdparty/" -x "hotspot-${version}/.git" + + rm -rf "hotspot-${version}" + - name: Build uses: docker://ghcr.io/kdab/kdesrc-build:latest - name: Delete latest release + if: ${{ env.CONTINUOUS_BUILD == true }} run: | gh release delete continuous --cleanup-tag || true env: @@ -28,11 +53,13 @@ jobs: - name: Rename artifacts run: | - cd ${{ github.workspace }} && mv hotspot-*.AppImage hotspot-continuous.AppImage - cd ${{ github.workspace }} && mv hotspot-debuginfo-*.tar.bz2 hotspot-debuginfo-continuous.tar.bz2 + [[ ${{ env.CONTINUOUS_BUILD }} == true ]] && version="continuous" || version=$(git describe --tags | sed -En 's/(v[0-9\.]+)-.*/\1/p') + cd ${{ github.workspace }} && mv hotspot-*.AppImage "hotspot-${version}.AppImage" + cd ${{ github.workspace }} && mv hotspot-debuginfo-*.tar.bz2 "hotspot-debuginfo-${version}.tar.bz2" - name: Create latest release uses: ncipollo/release-action@v1 + if: ${{ env.CONTINUOUS_BUILD == true }} with: name: "continuous" tag: "continuous" @@ -41,16 +68,29 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} artifacts: | ${{ github.workspace }}/hotspot-debuginfo-* + ${{ github.workspace }}/hotspot-perfparser-* + ${{ github.workspace }}/hotspot-PrefixTickLabels-* + ${{ github.workspace }}/hotspot-* ${{ github.workspace }}/*.AppImage - name: Release latest release + if: ${{ env.CONTINUOUS_BUILD == true }} run: | gh release edit continuous --draft=false || true env: GH_TOKEN: ${{ github.token }} - name: Create release PR + id: release uses: googleapis/release-please-action@v4.1.1 + if: ${{ env.CONTINUOUS_BUILD == false }} with: token: ${{ github.token }} release-type: simple + target-branch: ${{ github.ref_name }} + + - name: Upload Release Artifact + if: ${{ steps.release.outputs.release_created }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: gh release upload ${{ steps.release.outputs.tag_name }} ${{ github.workspace }}/hotspot-debuginfo-* ${{ github.workspace }}/hotspot-perfparser-* ${{ github.workspace }}/hotspot-PrefixTickLabels-* ${{ github.workspace }}/hotspot-* ${{ github.workspace }}/*.AppImage diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b7083ea..0c17872f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,10 @@ cmake_minimum_required(VERSION 3.16) + +file(STRINGS "version.txt" version) + project( hotspot - VERSION 1.5.80 + VERSION ${version} LANGUAGES CXX C ) diff --git a/src/main.cpp b/src/main.cpp index 90fdf71a..b5002bf4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -100,6 +100,8 @@ int main(int argc, char** argv) initRCCIconTheme(); #endif + qDebug() << "TEST"; + QCommandLineParser parser; parser.setApplicationDescription(QStringLiteral("Linux perf GUI for performance analysis.")); parser.addHelpOption(); @@ -113,6 +115,8 @@ int main(int argc, char** argv) QStringLiteral("path")); parser.addOption(sysroot); + qDebug() << "bugfix"; + const auto kallsyms = QCommandLineOption( QStringLiteral("kallsyms"), QCoreApplication::translate("main", "Path to kallsyms file which is used to resolve kernel symbols."), diff --git a/version.txt b/version.txt new file mode 100644 index 00000000..f0bb29e7 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +1.3.0