Skip to content

Commit

Permalink
Remove update checker and update pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
huxingyi committed Dec 16, 2022
1 parent 7a29cf7 commit 67c667c
Show file tree
Hide file tree
Showing 9 changed files with 84 additions and 381 deletions.
33 changes: 0 additions & 33 deletions .github/workflows/appimage.yml

This file was deleted.

83 changes: 83 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: release

on:
workflow_run:
workflows: ["development"]
types:
- completed

jobs:
appimage-upload:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
# Use oldest ubuntu to make AppImage work
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v3
- name: Install Qt
run: |
sudo apt-get update
sudo apt-get install -y qt5-default libqt5svg5-dev
- name: Build application
run: |
cd ${GITHUB_WORKSPACE}/application
qmake
make -j`nproc`
- name: Generate AppImage
run: |
sudo apt-get install -y libfuse2
cd ${GITHUB_WORKSPACE} && sh ./ci/appimage/bundle.sh
- name: Upload AppImage
uses: actions/upload-artifact@v3
with:
name: Dust3D-x86_64.AppImage
path: Dust3D-x86_64.AppImage
win32-msvc-upload:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
runs-on: windows-2019
steps:
- uses: actions/checkout@v3
- name: Set up Visual Studio shell
uses: egor-tensin/vs-shell@v2
with:
arch: x64
- name: Install Qt
# Generated by https://ddalcino.github.io/aqt-list-server/
uses: jurplel/install-qt-action@v3
with:
aqtversion: '==2.1.*'
version: '5.15.2'
host: 'windows'
target: 'desktop'
arch: 'win64_msvc2019_64'
archives: 'qttools qtsvg qtimageformats qtbase opengl32sw'
- name: Build application
run: |
cd $env:GITHUB_WORKSPACE/application
qmake -spec win32-msvc
nmake -f Makefile.Release
- name: Set environment variable
run: |
set PATH="%PATH%;C:\Program Files\7-Zip"
- name: Zip executable
run: |
7z a Dust3D-win32-x86_64.zip ${GITHUB_WORKSPACE}/application/release/dust3d.exe
7z a Dust3D-win32-x86_64.zip ${GITHUB_WORKSPACE}/../Qt/5.15.2/msvc2019_64/bin/Qt5Widgets.dll
7z a Dust3D-win32-x86_64.zip ${GITHUB_WORKSPACE}/../Qt/5.15.2/msvc2019_64/bin/Qt5Gui.dll
7z a Dust3D-win32-x86_64.zip ${GITHUB_WORKSPACE}/../Qt/5.15.2/msvc2019_64/bin/Qt5Core.dll
7z a Dust3D-win32-x86_64.zip ${GITHUB_WORKSPACE}/../Qt/5.15.2/msvc2019_64/bin/opengl32sw.dll
ls "${VCToolsRedistDir}x64"
7z a Dust3D-win32-x86_64.zip "${VCToolsRedistDir}x64/Microsoft.VC142.CRT/msvcp140.dll"
7z a Dust3D-win32-x86_64.zip "${VCToolsRedistDir}x64/Microsoft.VC142.CRT/vcruntime140.dll"
mkdir ${GITHUB_WORKSPACE}/platforms
cp ${GITHUB_WORKSPACE}/../Qt/5.15.2/msvc2019_64/plugins/platforms/qwindows.dll ${GITHUB_WORKSPACE}/platforms/qwindows.dll
7z a Dust3D-win32-x86_64.zip -r ${GITHUB_WORKSPACE}/platforms/
mkdir ${GITHUB_WORKSPACE}/imageformats
cp ${GITHUB_WORKSPACE}/../Qt/5.15.2/msvc2019_64/plugins/imageformats/qjpeg.dll ${GITHUB_WORKSPACE}/imageformats/qjpeg.dll
cp ${GITHUB_WORKSPACE}/../Qt/5.15.2/msvc2019_64/plugins/imageformats/qsvg.dll ${GITHUB_WORKSPACE}/imageformats/qsvg.dll
7z a Dust3D-win32-x86_64.zip -r ${GITHUB_WORKSPACE}/imageformats/
shell: bash
- name: Upload zip
uses: actions/upload-artifact@v3
with:
name: Dust3D-win32-x86_64.zip
path: Dust3D-win32-x86_64.zip
8 changes: 1 addition & 7 deletions application/application.pro
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
QT += core gui opengl widgets svg network
QT += core gui opengl widgets svg

TARGET = dust3d
TEMPLATE = app
Expand All @@ -15,7 +15,6 @@ HOMEPAGE_URL = "https://dust3d.org/"
REPOSITORY_URL = "https://github.com/huxingyi/dust3d"
ISSUES_URL = "https://github.com/huxingyi/dust3d/issues"
REFERENCE_GUIDE_URL = "https://docs.dust3d.org"
UPDATES_CHECKER_URL = "https://dust3d.org/dust3d-updateinfo.xml"

DEFINES += QT_MESSAGELOGCONTEXT
DEFINES += _USE_MATH_DEFINES
Expand Down Expand Up @@ -67,7 +66,6 @@ DEFINES += "PROJECT_DEFINED_APP_HOMEPAGE_URL=\"\\\"$$HOMEPAGE_URL\\\"\""
DEFINES += "PROJECT_DEFINED_APP_REPOSITORY_URL=\"\\\"$$REPOSITORY_URL\\\"\""
DEFINES += "PROJECT_DEFINED_APP_ISSUES_URL=\"\\\"$$ISSUES_URL\\\"\""
DEFINES += "PROJECT_DEFINED_APP_REFERENCE_GUIDE_URL=\"\\\"$$REFERENCE_GUIDE_URL\\\"\""
DEFINES += "PROJECT_DEFINED_APP_UPDATES_CHECKER_URL=\"\\\"$$UPDATES_CHECKER_URL\\\"\""
DEFINES += "PROJECT_DEFINED_APP_PLATFORM=\"\\\"$$PLATFORM\\\"\""
OBJECTS_DIR = obj
Expand Down Expand Up @@ -205,10 +203,6 @@ HEADERS += sources/toolbar_button.h
SOURCES += sources/toolbar_button.cc
HEADERS += sources/turnaround_loader.h
SOURCES += sources/turnaround_loader.cc
HEADERS += sources/updates_check_widget.h
SOURCES += sources/updates_check_widget.cc
HEADERS += sources/updates_checker.h
SOURCES += sources/updates_checker.cc
HEADERS += sources/uv_map_generator.h
SOURCES += sources/uv_map_generator.cc
HEADERS += sources/version.h
Expand Down
17 changes: 0 additions & 17 deletions application/sources/document_window.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include "skeleton_graphics_widget.h"
#include "spinnable_toolbar_icon.h"
#include "theme.h"
#include "updates_check_widget.h"
#include "uv_map_generator.h"
#include "version.h"
#include <QApplication>
Expand Down Expand Up @@ -55,7 +54,6 @@ QTextBrowser* g_acknowlegementsWidget = nullptr;
AboutWidget* g_aboutWidget = nullptr;
QTextBrowser* g_contributorsWidget = nullptr;
QTextBrowser* g_supportersWidget = nullptr;
UpdatesCheckWidget* g_updatesCheckWidget = nullptr;

void outputMessage(QtMsgType type, const QMessageLogContext& context, const QString& msg)
{
Expand Down Expand Up @@ -138,17 +136,6 @@ void DocumentWindow::showAbout()
g_aboutWidget->raise();
}

void DocumentWindow::checkForUpdates()
{
if (!g_updatesCheckWidget) {
g_updatesCheckWidget = new UpdatesCheckWidget;
}
g_updatesCheckWidget->check();
g_updatesCheckWidget->show();
g_updatesCheckWidget->activateWindow();
g_updatesCheckWidget->raise();
}

size_t DocumentWindow::total()
{
return g_documentWindows.size();
Expand Down Expand Up @@ -470,10 +457,6 @@ DocumentWindow::DocumentWindow()
connect(m_viewSourceAction, &QAction::triggered, this, &DocumentWindow::viewSource);
m_helpMenu->addAction(m_viewSourceAction);

m_checkForUpdatesAction = new QAction(tr("Check for Updates..."), this);
connect(m_checkForUpdatesAction, &QAction::triggered, this, &DocumentWindow::checkForUpdates);
m_helpMenu->addAction(m_checkForUpdatesAction);

m_helpMenu->addSeparator();

m_seeReferenceGuideAction = new QAction(tr("Reference Guide"), this);
Expand Down
2 changes: 0 additions & 2 deletions application/sources/document_window.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ public slots:
void gotoHomepage();
void viewSource();
void about();
void checkForUpdates();
void reportIssues();
void seeAcknowlegements();
void seeContributors();
Expand Down Expand Up @@ -160,7 +159,6 @@ public slots:
QAction* m_gotoHomepageAction = nullptr;
QAction* m_viewSourceAction = nullptr;
QAction* m_aboutAction = nullptr;
QAction* m_checkForUpdatesAction = nullptr;
QAction* m_reportIssuesAction = nullptr;
QAction* m_seeContributorsAction = nullptr;
QAction* m_seeSupportersAction = nullptr;
Expand Down
107 changes: 0 additions & 107 deletions application/sources/updates_check_widget.cc

This file was deleted.

29 changes: 0 additions & 29 deletions application/sources/updates_check_widget.h

This file was deleted.

0 comments on commit 67c667c

Please sign in to comment.