Skip to content

Commit 5d22954

Browse files
committed
Add new libkrb5 dependency
1 parent 76befd7 commit 5d22954

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

.github/workflows/build.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,9 @@ jobs:
212212
with:
213213
submodules: true
214214

215+
- name: Install system dependencies
216+
run: sudo apt update && sudo apt install -y libkrb5-dev
217+
215218
- name: Install quilt
216219
uses: awalsh128/cache-apt-pkgs-action@latest
217220
with:
@@ -292,6 +295,9 @@ jobs:
292295
- name: Checkout repo
293296
uses: actions/checkout@v3
294297

298+
- name: Install system dependencies
299+
run: sudo apt update && sudo apt install -y libkrb5-dev
300+
295301
- name: Install Node.js v16
296302
uses: actions/setup-node@v3
297303
with:
@@ -348,6 +354,9 @@ jobs:
348354
- name: Checkout repo
349355
uses: actions/checkout@v3
350356

357+
- name: Install system dependencies
358+
run: sudo apt update && sudo apt install -y libkrb5-dev
359+
351360
- name: Install Node.js v16
352361
uses: actions/setup-node@v3
353362
with:

.github/workflows/release.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ jobs:
4646
yum install -y devtoolset-9-{make,gcc,gcc-c++} jq rsync python3
4747
# for keytar
4848
yum install -y libsecret-devel
49+
# for kerberos
50+
yum install -y krb5-devel
4951
5052
- name: Install nfpm and envsubst
5153
run: |
@@ -157,8 +159,8 @@ jobs:
157159
curl -sSfL https://github.com/goreleaser/nfpm/releases/download/v2.3.1/nfpm_2.3.1_`uname -s`_`uname -m`.tar.gz | tar -C ~/.local/bin -zxv nfpm
158160
echo "$HOME/.local/bin" >> $GITHUB_PATH
159161
160-
- name: Install cross-compiler
161-
run: sudo apt update && sudo apt install $PACKAGE
162+
- name: Install cross-compiler and system dependencies
163+
run: sudo apt update && sudo apt install -y $PACKAGE libkrb5-dev
162164
env:
163165
PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
164166

@@ -305,7 +307,7 @@ jobs:
305307
npm version --prefix release "$VERSION"
306308
307309
echo "Updating version in lib/vscode/product.json"
308-
tmp=$(mktemp)
310+
tmp=$(mktemp)
309311
jq ".codeServerVersion = \"$VERSION\"" release/lib/vscode/product.json > "$tmp" && mv "$tmp" release/lib/vscode/product.json
310312
# Ensure it has the same permissions as before
311313
chmod 644 release/lib/vscode/product.json

docs/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Here is what is needed:
6363
If you're developing code-server on Linux, make sure you have installed or install the following dependencies:
6464

6565
```shell
66-
sudo apt-get install build-essential g++ libx11-dev libxkbfile-dev libsecret-1-dev python-is-python3
66+
sudo apt-get install build-essential g++ libx11-dev libxkbfile-dev libsecret-1-dev libkrb5-dev python-is-python3
6767
```
6868

6969
These are required by Code. See [their Wiki](https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites) for more information.

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
nativeBuildInputs = with pkgs; [
1515
nodejs yarn' python3 pkg-config git rsync jq moreutils quilt bats
1616
];
17-
buildInputs = with pkgs; (lib.optionals (!stdenv.isDarwin) [ libsecret ]
17+
buildInputs = with pkgs; (lib.optionals (!stdenv.isDarwin) [ libsecret libkrb5 ]
1818
++ (with xorg; [ libX11 libxkbfile ])
1919
++ lib.optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [
2020
AppKit Cocoa CoreServices Security xcbuild

0 commit comments

Comments
 (0)