Skip to content

Commit 95102be

Browse files
author
nefarius2001
committed
artifacts+codeQL in one action for Linux
1 parent 758ed16 commit 95102be

File tree

7 files changed

+8
-70
lines changed

7 files changed

+8
-70
lines changed

.github/workflows/autobuild.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,30 +92,22 @@ jobs:
9292
fail-fast: false
9393
matrix: # Think of this like a foreach loop. Basically runs the steps with every combination of the contents of this. More info: https://docs.github.com/en/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
9494
config:
95-
- config_name: AndroidAPK (artifact+codeql)
95+
- config_name: AndroidAPK (artifact+codeQL)
9696
target_os: android
9797
building_on_os: ubuntu-20.04
9898
cmd1_prebuild: "sh ./autobuild/android/autobuild_apk_1_prepare.sh "
9999
cmd2_build: "./autobuild/android/autobuild_apk_2_build.sh "
100100
cmd3_postbuild: "./autobuild/android/autobuild_apk_3_copy_files.sh "
101101
uses_codeql: true
102102

103-
- config_name: Linux (codeQL)
103+
- config_name: Linux (artifacts+codeQL)
104104
target_os: linux
105105
building_on_os: ubuntu-20.04
106-
cmd1_prebuild: "./autobuild/linux/codeQL/auto_1_prepare.sh ${{ needs.create_release.outputs.x_github_workspace }}"
107-
cmd2_build: "./autobuild/linux/codeQL/auto_2_build_qt_project.sh"
108-
cmd3_postbuild: "./autobuild/linux/codeQL/auto_3_copy_files.sh"
106+
cmd1_prebuild: "sh ./autobuild/linux/autobuild_deb_1_prepare.sh"
107+
cmd2_build: "./autobuild/linux/autobuild_deb_2_build.sh"
108+
cmd3_postbuild: "./autobuild/linux/autobuild_deb_3_copy_files.sh"
109109
uses_codeql: true
110110

111-
- config_name: Linux (artifacts)
112-
target_os: linux
113-
building_on_os: ubuntu-20.04
114-
cmd1_prebuild: "./autobuild/linux/artifacts/autobuild_deb_1_prepare.sh"
115-
cmd2_build: "./autobuild/linux/artifacts/autobuild_deb_2_build.sh"
116-
cmd3_postbuild: "./autobuild/linux/artifacts/autobuild_deb_3_copy_files.sh"
117-
uses_codeql: false
118-
119111
- config_name: MacOS (codeQL)
120112
target_os: macos
121113
building_on_os: macos-10.15
@@ -132,7 +124,7 @@ jobs:
132124
cmd3_postbuild: "./autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh"
133125
uses_codeql: false
134126

135-
- config_name: Windows (artifact+codeql)
127+
- config_name: Windows (artifact+codeQL)
136128
target_os: windows
137129
building_on_os: windows-latest
138130
cmd1_prebuild: powershell .\autobuild\windows\autobuild_windowsinstaller_1_prepare.ps1
File renamed without changes.

autobuild/linux/artifacts/autobuild_deb_2_build.sh renamed to autobuild/linux/autobuild_deb_2_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
### PARAMETERS ###
88
####################
99

10-
source $(dirname $(readlink -f "${BASH_SOURCE[0]}"))/../../ensure_THIS_JAMULUS_PROJECT_PATH.sh
10+
source $(dirname $(readlink -f "${BASH_SOURCE[0]}"))/../ensure_THIS_JAMULUS_PROJECT_PATH.sh
1111

1212
###################
1313
### PROCEDURE ###

autobuild/linux/artifacts/autobuild_deb_3_copy_files.sh renamed to autobuild/linux/autobuild_deb_3_copy_files.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
### PARAMETERS ###
88
####################
99

10-
source $(dirname $(readlink -f "${BASH_SOURCE[0]}"))/../../ensure_THIS_JAMULUS_PROJECT_PATH.sh
10+
source $(dirname $(readlink -f "${BASH_SOURCE[0]}"))/../ensure_THIS_JAMULUS_PROJECT_PATH.sh
1111

1212
###################
1313
### PROCEDURE ###

autobuild/linux/codeQL/auto_1_prepare.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

autobuild/linux/codeQL/auto_2_build_qt_project.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

autobuild/linux/codeQL/auto_3_copy_files.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)