diff --git a/.woodpecker/ci.yml b/.woodpecker/ci.yml index f7878793a..2bbdbfe1b 100644 --- a/.woodpecker/ci.yml +++ b/.woodpecker/ci.yml @@ -1,13 +1,10 @@ -labels: - realm: lab - when: - - event: [push, tag, manual, pull_request] + - event: [cron, tag, manual, pull_request] steps: build: - #image: node:lts - image: node:18.20.2 + #image: node:18.20.2 + image: node:20.11.1 commands: - | echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list @@ -33,15 +30,35 @@ steps: python-is-python3 \ python3 \ rsync \ - xvfb + xvfb \ + quilt + - quilt push -a - yarn install - yarn build - export VERSION='0.0.0' && yarn build:vscode - yarn release - yarn release:standalone - yarn package - - ls -la - - ls -la release/* - - ls -la release-standalone/* - ls -la release-packages/* - - ls -la out/* \ No newline at end of file + when: + event: pull_request + branch: ${CI_REPO_DEFAULT_BRANCH} + + save-package: + image: ocram85/plugin-gitea-package:0.1.0 + secrets: [ gitea_user, gitea_passwd] + settings: + user: + from_secret: gitea_user + password: + from_secret: gitea_passwd + debug: "true" + owner: "ocram85" + package_name: "test_build" + package_version: "0.1.0" + file_source: "./release-packages/code-server-0.0.0-linux-amd64.tar.gz" + file_name: "code-server.tar.gz" + update: "true" + when: + event: pull_request + branch: ${CI_REPO_DEFAULT_BRANCH} \ No newline at end of file diff --git a/lib/vscode b/lib/vscode index f1e16e1e6..b58957e67 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit f1e16e1e6214d7c44d078b1f0607b2388f29d729 +Subproject commit b58957e67ee1e712cebf466b995adf4c5307b2bd diff --git a/patches/product-json.diff b/patches/product-json.diff new file mode 100644 index 000000000..899a9d2fb --- /dev/null +++ b/patches/product-json.diff @@ -0,0 +1,39 @@ +Description: update product.json +Index: code-server/ci/build/build-vscode.sh +=================================================================== +--- code-server.orig/ci/build/build-vscode.sh ++++ code-server/ci/build/build-vscode.sh +@@ -70,21 +70,21 @@ main() { + jq --slurp '.[0] * .[1]' product.original.json <( + cat << EOF + { +- "enableTelemetry": true, ++ "enableTelemetry": false, + "quality": "stable", + "codeServerVersion": "$VERSION", +- "nameShort": "code-server", +- "nameLong": "code-server", +- "applicationName": "code-server", +- "dataFolderName": ".code-server", +- "win32MutexName": "codeserver", ++ "nameShort": "arkanum-server", ++ "nameLong": "arkanum-server", ++ "applicationName": "arkanum-server", ++ "dataFolderName": ".arkanum-server", ++ "win32MutexName": "arkanumserver", + "licenseUrl": "https://github.com/coder/code-server/blob/main/LICENSE", +- "win32DirName": "code-server", +- "win32NameVersion": "code-server", +- "win32AppUserModelId": "coder.code-server", +- "win32ShellNameShort": "c&ode-server", +- "darwinBundleIdentifier": "com.coder.code.server", +- "linuxIconName": "com.coder.code.server", ++ "win32DirName": "arkanum-server", ++ "win32NameVersion": "arkanum-server", ++ "win32AppUserModelId": "arkanum.arkanum-server", ++ "win32ShellNameShort": "a&rkanum-server", ++ "darwinBundleIdentifier": "dev.arkanum.arkanum.server", ++ "linuxIconName": "dev.arkanum.arkanum.server", + "reportIssueUrl": "https://github.com/coder/code-server/issues/new", + "documentationUrl": "https://go.microsoft.com/fwlink/?LinkID=533484#vscode", + "keyboardShortcutsUrlMac": "https://go.microsoft.com/fwlink/?linkid=832143", diff --git a/patches/series b/patches/series index e5d456fda..f70ecd638 100644 --- a/patches/series +++ b/patches/series @@ -20,4 +20,5 @@ cli-window-open.diff getting-started.diff safari.diff keepalive.diff +product-json.diff clipboard.diff diff --git a/src/browser/media/favicon-dark-support.svg b/src/browser/media/favicon-dark-support.svg index 06f1fa00d..bfd5a7e21 100644 --- a/src/browser/media/favicon-dark-support.svg +++ b/src/browser/media/favicon-dark-support.svg @@ -1,7 +1,130 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/browser/media/favicon.ico b/src/browser/media/favicon.ico index e721447bd..8505300f9 100644 Binary files a/src/browser/media/favicon.ico and b/src/browser/media/favicon.ico differ diff --git a/src/browser/media/favicon.svg b/src/browser/media/favicon.svg index 45388729b..bfd5a7e21 100644 --- a/src/browser/media/favicon.svg +++ b/src/browser/media/favicon.svg @@ -1 +1,130 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/browser/media/favicon_back.svg b/src/browser/media/favicon_back.svg new file mode 100644 index 000000000..45388729b --- /dev/null +++ b/src/browser/media/favicon_back.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/browser/media/pwa-icon-192.png b/src/browser/media/pwa-icon-192.png index a6ee50311..1b167e61b 100644 Binary files a/src/browser/media/pwa-icon-192.png and b/src/browser/media/pwa-icon-192.png differ diff --git a/src/browser/media/pwa-icon-512.png b/src/browser/media/pwa-icon-512.png index ff42978ce..1cb905da6 100644 Binary files a/src/browser/media/pwa-icon-512.png and b/src/browser/media/pwa-icon-512.png differ diff --git a/src/browser/media/pwa-icon.png b/src/browser/media/pwa-icon.png index d4f5188ff..4de14a2a3 100644 Binary files a/src/browser/media/pwa-icon.png and b/src/browser/media/pwa-icon.png differ diff --git a/src/browser/media/pwa-icon_back.png b/src/browser/media/pwa-icon_back.png new file mode 100644 index 000000000..d4f5188ff Binary files /dev/null and b/src/browser/media/pwa-icon_back.png differ