Skip to content

Commit c2ebe9a

Browse files
committed
Merge branch 'feature/KASM-6518-remove-unsupported-os-builds' into 'master'
Resolve KASM-6518 "Feature/ remove unsupported os builds" Closes KASM-6518 See merge request kasm-technologies/internal/KasmVNC!158
2 parents a05e397 + 8f410e1 commit c2ebe9a

30 files changed

+28
-1145
lines changed

.gitlab-ci.yml

+7-196
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variables:
77
GITLAB_SHARED_DIND_DIR: /builds/$CI_PROJECT_PATH/shared
88
GIT_SUBMODULE_STRATEGY: normal
99
GIT_FETCH_EXTRA_FLAGS: --tags --force
10-
# E.g. BUILD_JOBS: build_debian_buster,build_ubuntu_bionic. This will include
10+
# E.g. BUILD_JOBS: build_debian_buster,build_ubuntu_focal. This will include
1111
# arm builds, because build_debian_buster_arm matches build_debian_buster.
1212
# "BUILD_JOBS: none" won't build any build jobs, nor www.
1313
BUILD_JOBS: all
@@ -66,44 +66,6 @@ build_www:
6666
paths:
6767
- output/
6868

69-
build_ubuntu_bionic:
70-
stage: build
71-
allow_failure: true
72-
tags:
73-
- oci-fixed-amd
74-
before_script:
75-
- *prepare_build
76-
- *prepare_www
77-
after_script:
78-
- *prepare_artfacts
79-
script:
80-
- bash builder/build-package ubuntu bionic
81-
only:
82-
variables:
83-
- $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
84-
artifacts:
85-
paths:
86-
- output/
87-
88-
build_ubuntu_bionic_arm:
89-
stage: build
90-
allow_failure: false
91-
tags:
92-
- oci-fixed-arm
93-
before_script:
94-
- *prepare_build
95-
- *prepare_www
96-
after_script:
97-
- *prepare_artfacts
98-
script:
99-
- bash builder/build-package ubuntu bionic
100-
only:
101-
variables:
102-
- $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
103-
artifacts:
104-
paths:
105-
- output/
106-
10769
build_ubuntu_focal:
10870
stage: build
10971
allow_failure: true
@@ -198,46 +160,8 @@ build_ubuntu_noble:
198160
artifacts:
199161
paths:
200162
- output/
201-
202-
build_ubuntu_noble_arm:
203-
stage: build
204-
allow_failure: true
205-
tags:
206-
- oci-fixed-arm
207-
before_script:
208-
- *prepare_build
209-
- *prepare_www
210-
after_script:
211-
- *prepare_artfacts
212-
script:
213-
- bash builder/build-package ubuntu noble;
214-
only:
215-
variables:
216-
- $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
217-
artifacts:
218-
paths:
219-
- output/
220163

221-
build_debian_buster:
222-
stage: build
223-
allow_failure: true
224-
tags:
225-
- oci-fixed-amd
226-
before_script:
227-
- *prepare_build
228-
- *prepare_www
229-
after_script:
230-
- *prepare_artfacts
231-
script:
232-
- bash builder/build-package debian buster;
233-
only:
234-
variables:
235-
- $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
236-
artifacts:
237-
paths:
238-
- output/
239-
240-
build_debian_buster_arm:
164+
build_ubuntu_noble_arm:
241165
stage: build
242166
allow_failure: true
243167
tags:
@@ -248,7 +172,7 @@ build_debian_buster_arm:
248172
after_script:
249173
- *prepare_artfacts
250174
script:
251-
- bash builder/build-package debian buster;
175+
- bash builder/build-package ubuntu noble;
252176
only:
253177
variables:
254178
- $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
@@ -485,82 +409,6 @@ build_opensuse_15_arm:
485409
paths:
486410
- output/
487411

488-
build_fedora_thirtyseven:
489-
stage: build
490-
allow_failure: true
491-
tags:
492-
- oci-fixed-amd
493-
before_script:
494-
- *prepare_build
495-
- *prepare_www
496-
after_script:
497-
- *prepare_artfacts
498-
script:
499-
- bash builder/build-package fedora thirtyseven;
500-
only:
501-
variables:
502-
- $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
503-
artifacts:
504-
paths:
505-
- output/
506-
507-
build_fedora_thirtyseven_arm:
508-
stage: build
509-
allow_failure: true
510-
tags:
511-
- oci-fixed-arm
512-
before_script:
513-
- *prepare_build
514-
- *prepare_www
515-
after_script:
516-
- *prepare_artfacts
517-
script:
518-
- bash builder/build-package fedora thirtyseven;
519-
only:
520-
variables:
521-
- $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
522-
artifacts:
523-
paths:
524-
- output/
525-
526-
build_fedora_thirtyeight:
527-
stage: build
528-
allow_failure: true
529-
tags:
530-
- oci-fixed-amd
531-
before_script:
532-
- *prepare_build
533-
- *prepare_www
534-
after_script:
535-
- *prepare_artfacts
536-
script:
537-
- bash builder/build-package fedora thirtyeight;
538-
only:
539-
variables:
540-
- $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
541-
artifacts:
542-
paths:
543-
- output/
544-
545-
build_fedora_thirtyeight_arm:
546-
stage: build
547-
allow_failure: true
548-
tags:
549-
- oci-fixed-arm
550-
before_script:
551-
- *prepare_build
552-
- *prepare_www
553-
after_script:
554-
- *prepare_artfacts
555-
script:
556-
- bash builder/build-package fedora thirtyeight;
557-
only:
558-
variables:
559-
- $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
560-
artifacts:
561-
paths:
562-
- output/
563-
564412
build_fedora_thirtynine:
565413
stage: build
566414
allow_failure: true
@@ -617,13 +465,13 @@ build_fedora_forty:
617465
artifacts:
618466
paths:
619467
- output/
620-
468+
621469
build_fedora_forty_arm:
622470
stage: build
623471
allow_failure: true
624472
tags:
625473
- oci-fixed-arm
626-
before_script:
474+
before_script:
627475
- *prepare_build
628476
- *prepare_www
629477
after_script:
@@ -655,63 +503,26 @@ build_fedora_fortyone:
655503
artifacts:
656504
paths:
657505
- output/
658-
506+
659507
build_fedora_fortyone_arm:
660508
stage: build
661509
allow_failure: true
662510
tags:
663511
- oci-fixed-arm
664-
before_script:
665-
- *prepare_build
666-
- *prepare_www
667-
after_script:
668-
- *prepare_artfacts
669-
script:
670-
- bash builder/build-package fedora fortyone;
671-
only:
672-
variables:
673-
- $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
674-
artifacts:
675-
paths:
676-
- output/
677-
678-
build_alpine_317:
679-
stage: build
680-
allow_failure: true
681-
tags:
682-
- oci-fixed-amd
683512
before_script:
684513
- *prepare_build
685514
- *prepare_www
686515
after_script:
687516
- *prepare_artfacts
688517
script:
689-
- bash builder/build-package alpine 317;
518+
- bash builder/build-package fedora fortyone;
690519
only:
691520
variables:
692521
- $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
693522
artifacts:
694523
paths:
695524
- output/
696525

697-
build_alpine_317_arm:
698-
stage: build
699-
allow_failure: true
700-
tags:
701-
- oci-fixed-arm
702-
before_script:
703-
- *prepare_build
704-
- *prepare_www
705-
after_script:
706-
- *prepare_artfacts
707-
script:
708-
- bash builder/build-package alpine 317;
709-
only:
710-
variables:
711-
- $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
712-
artifacts:
713-
paths:
714-
- output/
715526

716527
test:
717528
stage: test

BUILDING.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Build Requirements (Windows)
4848
You also need the Inno Setup Preprocessor, which is available in the
4949
Inno Setup QuickStart Pack.
5050

51-
Add the directory containing iscc.exe (for instance,
51+
Add the directory containing iscc.exe (for instance,
5252
C:\Program Files\Inno Setup 5) to the system or user PATH environment
5353
variable prior to building KasmVNC.
5454

@@ -123,7 +123,7 @@ but the general outline is as follows.
123123
> cp -R {xorg_source}/* unix/xserver/
124124
(NOTE: {xorg_source} is the directory containing the Xorg source for the
125125
machine on which you are building KasmVNC. The most recent versions of
126-
Red Hat/CentOS/Fedora, for instance, provide an RPM called
126+
Red Hat/Fedora, for instance, provide an RPM called
127127
"xorg-x11-server-source", which installs the Xorg source under
128128
/usr/share/xorg-x11-server-source.)
129129

@@ -146,8 +146,8 @@ but the general outline is as follows.
146146
--with-serverconfig-path=/usr/lib[64]/xorg \
147147
--with-dri-driver-path=/usr/lib[64]/dri \
148148
{additional configure options}
149-
(NOTE: This is merely an example that works with Red Hat Enterprise/CentOS
150-
6 and recent Fedora releases. You should customize it for your particular
149+
(NOTE: This is merely an example that works with Red Hat Enterprise
150+
and recent Fedora releases. You should customize it for your particular
151151
system. In particular, it will be necessary to customize the font, XKB,
152152
and DRI directories.)
153153

@@ -220,7 +220,7 @@ Building TLS Support
220220
======================================
221221

222222
TLS requires GnuTLS, which is supplied with most Linux distributions and
223-
with MinGW for Windows and can be built from source on OS X and other
223+
with MinGW for Windows and can be built from source on OS X and other
224224
Unix variants. However, GnuTLS versions > 2.12.x && < 3.3.x should be
225225
avoided because of potential incompatibilities during initial handshaking.
226226

@@ -347,7 +347,7 @@ X server source (for instance, --host=i686-pc-linux-gnu).
347347
Add
348348

349349
-DCMAKE_OSX_SYSROOT=/Developer/SDKs/MacOSX10.5.sdk \
350-
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.5
350+
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.5
351351

352352
to the CMake command line. The OS X 10.5 SDK must be installed.
353353

@@ -439,7 +439,7 @@ Distribution-Specific Packaging
439439
===============================
440440

441441

442-
RPM Packages for RHEL / CentOS
442+
RPM Packages for RHEL
443443
------------------------------
444444

445445
The RPM spec files and patches used to create the nightly builds

README.md

+1-17
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,6 @@ sudo dnf localinstall ./kasmvncserver_*.rpm
4646
sudo usermod -a -G kasmvnc-cert $USER
4747
```
4848

49-
### CentOS 7
50-
51-
```sh
52-
# Please choose the package for your distro here (under Assets):
53-
# https://github.com/kasmtech/KasmVNC/releases
54-
wget <package_url>
55-
56-
# Ensure KasmVNC dependencies are available
57-
sudo yum install epel-release
58-
59-
sudo yum install ./kasmvncserver_*.rpm
60-
61-
# Add your user to the kasmvnc-cert group
62-
sudo usermod -a -G kasmvnc-cert $USER
63-
```
64-
6549
## Getting Started
6650

6751
The following examples provide basic usage of KasmVNC with the tools provided. For full documentation on all the utilities and the runtime environment, see our [KasmVNC Documentation](https://www.kasmweb.com/kasmvnc/docs/latest/index.html)
@@ -250,7 +234,7 @@ command_line:
250234
- Keyboard input rate limit
251235
- Screen region selection
252236
- Deb packages for Debian, Ubuntu, and Kali Linux included in release.
253-
- RPM packages for CentOS, Oracle, OpenSUSE, Fedora. RPM packages are currently not updatable and not released, though you can build and install them. See build documentation.
237+
- RPM packages for Oracle, OpenSUSE, Fedora. RPM packages are currently not updatable and not released, though you can build and install them. See build documentation.
254238
- Web [API](https://github.com/kasmtech/KasmVNC/wiki/API) added for remotely controlling and getting information from KasmVNC
255239
- Multi-User support with permissions that can be changed via the API
256240
- Web UI uses a webpack for faster load times.

0 commit comments

Comments
 (0)