Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cellframe-node-diagtool
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
cellframe-node-diagtool
Commits
1ce4745e
Commit
1ce4745e
authored
8 months ago
by
Dmitry Puzyrkov
Browse files
Options
Downloads
Patches
Plain Diff
...
parent
37e816b1
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+0
-103
0 additions, 103 deletions
.gitlab-ci.yml
CMakeLists.txt
+6
-3
6 additions, 3 deletions
CMakeLists.txt
with
6 additions
and
106 deletions
.gitlab-ci.yml
+
0
−
103
View file @
1ce4745e
variables
:
GIT_SUBMODULE_STRATEGY
:
recursive
stages
:
-
build
-
deploy
-
publish
.ci-polygon
:
tags
:
-
ci-polygon
.build
:
extends
:
.ci-polygon
stage
:
build
timeout
:
3 hours 30 minutes
dependencies
:
[]
artifacts
:
paths
:
-
build_*/*.deb
.deploy
:
extends
:
.ci-polygon
image
:
demlabs/amd64/debian-buster:linuxbuilder
stage
:
deploy
before_script
:
/opt/buildtools/prepare_environment.sh
.publish
:
extends
:
.deploy
stage
:
publish
allow_failure
:
true
macos-amd64
:
extends
:
.build
image
:
demlabs/amd64/debian-bullseye:osxbuilderssl
before_script
:
/opt/buildtools/prepare_environment.sh amd64-osx
script
:
-
./prod_build/build.sh --target osx release
-
./prod_build/pack.sh --target osx release --sign /opt/buildtools/sign/macos/demlabs.sh
artifacts
:
paths
:
-
build_*/*.pkg
linux-amd64-debian-buster
:
extends
:
.build
image
:
demlabs/amd64/debian-buster:linuxbuilder
before_script
:
/opt/buildtools/prepare_environment.sh amd64-linux
script
:
-
./prod_build/build.sh --target linux release
-
./prod_build/pack.sh --target linux release
-
anybadge -l "master version" -v "$(source version.mk; echo "$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH")" -f version-badge.svg -c blue
-
/opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-dashboard/$CI_COMMIT_REF_NAME/ ./version-badge.svg ||
true
linux-arm64-debian-bullseye
:
extends
:
.build
image
:
demlabs/arm64v8/debian-bullseye:linuxbuilder
before_script
:
/opt/buildtools/prepare_environment.sh arm64-linux
script
:
-
./prod_build/build.sh --target linux release
-
./prod_build/pack.sh --target linux release
-
anybadge -l "master version" -v "$(source version.mk; echo "$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH")" -f version-badge.svg -c blue
-
/opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-dashboard/$CI_COMMIT_REF_NAME/ ./version-badge.svg ||
true
windows-amd64
:
extends
:
.build
image
:
demlabs/amd64/debian-bullseye:windowsbuilder
before_script
:
/opt/buildtools/prepare_environment.sh amd64-linux
script
:
-
./prod_build/build.sh --target windows release
-
./prod_build/pack.sh --target windows release --sign /opt/buildtools/sign/windows/cellframe-dashboard.sh
artifacts
:
paths
:
-
build_*/*.exe
deploy-linux
:
extends
:
.deploy
needs
:
-
linux-amd64-debian-buster
-
linux-arm64-debian-bullseye
script
:
-
/opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-dashboard/$CI_COMMIT_REF_NAME/ build_*/*.deb
deploy-macos
:
extends
:
.deploy
needs
:
-
macos-amd64
script
:
-
/opt/buildtools/deploy_files.sh pub_cellframe macos/cellframe-dashboard/$CI_COMMIT_REF_NAME/ build_*/*.pkg
deploy-windows
:
extends
:
.deploy
needs
:
-
windows-amd64
script
:
-
/opt/buildtools/deploy_files.sh pub_cellframe windows/cellframe-dashboard/$CI_COMMIT_REF_NAME/ build_*/*.exe
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
6
−
3
View file @
1ce4745e
...
@@ -14,8 +14,6 @@ find_package(Qt5 5.15 REQUIRED COMPONENTS
...
@@ -14,8 +14,6 @@ find_package(Qt5 5.15 REQUIRED COMPONENTS
set
(
CMAKE_AUTOMOC ON
)
set
(
CMAKE_AUTOMOC ON
)
set
(
CMAKE_AUTORCC ON
)
set
(
CMAKE_AUTORCC ON
)
if
(
UNIX
)
if
(
UNIX
)
if
(
DARWIN
)
if
(
DARWIN
)
add_definitions
(
-DCLI_PATH=
"./cellframe-node-cli"
)
add_definitions
(
-DCLI_PATH=
"./cellframe-node-cli"
)
...
@@ -66,6 +64,11 @@ target_include_directories(${PROJECT_NAME} PRIVATE ./CellframeNodeDiagtool)
...
@@ -66,6 +64,11 @@ target_include_directories(${PROJECT_NAME} PRIVATE ./CellframeNodeDiagtool)
target_include_directories
(
${
PROJECT_NAME
}
PRIVATE ./CellframeNodeTray
)
target_include_directories
(
${
PROJECT_NAME
}
PRIVATE ./CellframeNodeTray
)
target_link_libraries
(
${
PROJECT_NAME
}
target_link_libraries
(
${
PROJECT_NAME
}
Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets Qt5::Qml Qt5::QuickWidgets
PUBLIC
Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets Qt5::Qml Qt5::QuickWidgets
)
)
if
(
WIN32
)
target_link_libraries
(
${
PROJECT_NAME
}
PUBLIC psapi
)
endif
()
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment