Skip to content

Commit dc1e267

Browse files
mbektasmbektas
authored
Merge pull request #752 from mbektas/update-platform-keys
update platform keys for installers, update dependencies
2 parents 41ef6ef + 295231c commit dc1e267

File tree

4 files changed

+75
-112
lines changed

4 files changed

+75
-112
lines changed

‎.github/workflows/publish.yml

+21-21
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
strategy:
1515
matrix:
1616
cfg:
17-
- { platform: linux, platform_name: Linux, os: ubuntu-latest, build_platform: linux-64, conda_platform: linux-64 }
17+
- { platform: linux-64, platform_name: Linux x64, os: ubuntu-latest, build_platform: linux-64, conda_platform: linux-64 }
1818
- { platform: osx-64, platform_name: macOS x64, os: macos-latest, build_platform: osx-64, conda_platform: osx-64 }
1919
- { platform: osx-arm64, platform_name: macOS arm64, os: macos-latest, build_platform: osx-64, conda_platform: osx-arm64 }
20-
- { platform: win, platform_name: Windows, os: windows-latest, build_platform: win-64, conda_platform: win-64 }
20+
- { platform: win-64, platform_name: Windows x64, os: windows-latest, build_platform: win-64, conda_platform: win-64 }
2121

2222
name: '${{ matrix.cfg.platform_name }} installer'
2323
runs-on: ${{ matrix.cfg.os }}
@@ -122,19 +122,19 @@ jobs:
122122
yarn dist:${{ matrix.cfg.platform }}
123123
if: steps.release-exists.outputs.result == 'true'
124124

125-
- name: Upload Debian Installer
126-
if: matrix.cfg.platform == 'linux'
125+
- name: Upload Debian x64 Installer
126+
if: matrix.cfg.platform == 'linux-64'
127127
uses: actions/upload-artifact@v4
128128
with:
129-
name: debian-installer
129+
name: debian-installer-x64
130130
path: |
131131
dist/JupyterLab.deb
132132
133-
- name: Upload Fedora Installer
134-
if: matrix.cfg.platform == 'linux'
133+
- name: Upload Fedora x64 Installer
134+
if: matrix.cfg.platform == 'linux-64'
135135
uses: actions/upload-artifact@v4
136136
with:
137-
name: fedora-installer
137+
name: fedora-installer-x64
138138
path: |
139139
dist/JupyterLab.rpm
140140
@@ -154,31 +154,31 @@ jobs:
154154
path: |
155155
dist/JupyterLab-arm64.dmg
156156
157-
- name: Upload Windows Installer
158-
if: matrix.cfg.platform == 'win'
157+
- name: Upload Windows x64 Installer
158+
if: matrix.cfg.platform == 'win-64'
159159
uses: actions/upload-artifact@v4
160160
with:
161-
name: windows-installer
161+
name: windows-installer-x64
162162
path: |
163163
dist/JupyterLab-Setup.exe
164164
165-
- name: Upload Debian Installer as Release asset
166-
if: matrix.cfg.platform == 'linux' && steps.release-exists.outputs.result == 'true'
165+
- name: Upload Debian x64 Installer as Release asset
166+
if: matrix.cfg.platform == 'linux-64' && steps.release-exists.outputs.result == 'true'
167167
uses: svenstaro/upload-release-action@v2
168168
with:
169169
repo_token: ${{ secrets.JLAB_APP_TOKEN }}
170170
file: dist/JupyterLab.deb
171-
asset_name: JupyterLab-Setup-Debian.deb
171+
asset_name: JupyterLab-Setup-Debian-x64.deb
172172
tag: v${{ steps.package-info.outputs.version}}
173173
overwrite: true
174174

175-
- name: Upload Fedora Installer as Release asset
176-
if: matrix.cfg.platform == 'linux' && steps.release-exists.outputs.result == 'true'
175+
- name: Upload Fedora x64 Installer as Release asset
176+
if: matrix.cfg.platform == 'linux-64' && steps.release-exists.outputs.result == 'true'
177177
uses: svenstaro/upload-release-action@v2
178178
with:
179179
repo_token: ${{ secrets.JLAB_APP_TOKEN }}
180180
file: dist/JupyterLab.rpm
181-
asset_name: JupyterLab-Setup-Fedora.rpm
181+
asset_name: JupyterLab-Setup-Fedora-x64.rpm
182182
tag: v${{ steps.package-info.outputs.version}}
183183
overwrite: true
184184

@@ -222,18 +222,18 @@ jobs:
222222
tag: v${{ steps.package-info.outputs.version}}
223223
overwrite: true
224224

225-
- name: Upload Windows Installer as Release asset
226-
if: matrix.cfg.platform == 'win' && steps.release-exists.outputs.result == 'true'
225+
- name: Upload Windows x64 Installer as Release asset
226+
if: matrix.cfg.platform == 'win-64' && steps.release-exists.outputs.result == 'true'
227227
uses: svenstaro/upload-release-action@v2
228228
with:
229229
repo_token: ${{ secrets.JLAB_APP_TOKEN }}
230230
file: dist/JupyterLab-Setup.exe
231-
asset_name: JupyterLab-Setup-Windows.exe
231+
asset_name: JupyterLab-Setup-Windows-x64.exe
232232
tag: v${{ steps.package-info.outputs.version}}
233233
overwrite: true
234234

235235
- name: Upload latest.yml Release asset
236-
if: matrix.cfg.platform == 'win' && steps.release-exists.outputs.result == 'true'
236+
if: matrix.cfg.platform == 'win-64' && steps.release-exists.outputs.result == 'true'
237237
uses: svenstaro/upload-release-action@v2
238238
with:
239239
repo_token: ${{ secrets.JLAB_APP_TOKEN }}

‎package.json

+11-9
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,23 @@
1616
"extract": "node scripts/extract.js",
1717
"pack": "yarn build && electron-builder --dir",
1818
"dist": "yarn build && electron-builder",
19-
"dist:linux": "yarn build && electron-builder --linux --publish never",
19+
"dist:linux-64": "yarn build && electron-builder --linux --publish never",
20+
"dist:linux-aarch64": "yarn build && electron-builder --linux --arm64 --publish never",
2021
"dist:osx": "yarn build && electron-builder --macos --publish never",
2122
"dist:osx-64": "yarn dist:osx",
2223
"dist:osx-arm64": "yarn dist:osx",
2324
"dist:osx-dev": "yarn build && CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --macos --publish never",
24-
"dist:win": "yarn build && electron-builder --win --publish never",
25+
"dist:win-64": "yarn build && electron-builder --win --publish never",
2526
"dist:win-arm64": "yarn build && yarn electron-builder --arm64 --publish never",
2627
"update_workflow_conda_lock": "cd workflow_env && rimraf *.lock && conda-lock --kind explicit -f publish_env.yaml && cd -",
2728
"update_conda_lock": "cd env_installer && rimraf *.lock && conda-lock --kind explicit -f jlab_server.yaml && cd -",
2829
"clean_env_installer": "rimraf ./env_installer/jlab_server.tar.gz && rimraf ./env_installer/jlab_server",
29-
"create_env_installer:linux": "yarn clean_env_installer && conda-lock install --prefix ./env_installer/jlab_server ./env_installer/conda-linux-64.lock && conda pack -p ./env_installer/jlab_server -o ./env_installer/jlab_server.tar.gz",
30-
"create_env_installer:linux-aarch64": "yarn clean_env_installer && conda-lock install --prefix ./env_installer/jlab_server ./env_installer/conda-linux-aarch64.lock && conda pack -p ./env_installer/jlab_server -o ./env_installer/jlab_server.tar.gz",
31-
"create_env_installer:osx-64": "yarn clean_env_installer && conda-lock install --prefix ./env_installer/jlab_server ./env_installer/conda-osx-64.lock && conda pack -p ./env_installer/jlab_server -o ./env_installer/jlab_server.tar.gz",
32-
"create_env_installer:osx-arm64": "yarn clean_env_installer && conda-lock install --no-validate-platform --prefix ./env_installer/jlab_server ./env_installer/conda-osx-arm64.lock && conda pack -p ./env_installer/jlab_server -o ./env_installer/jlab_server.tar.gz",
33-
"create_env_installer:win": "yarn clean_env_installer && conda-lock install --prefix ./env_installer/jlab_server ./env_installer/conda-win-64.lock && conda pack -p ./env_installer/jlab_server -o ./env_installer/jlab_server.tar.gz",
30+
"create_env_installer": "yarn clean_env_installer && conda-lock install --no-validate-platform --prefix ./env_installer/jlab_server ./env_installer/conda-${ENV_PLATFORM}.lock && conda pack -p ./env_installer/jlab_server -o ./env_installer/jlab_server.tar.gz",
31+
"create_env_installer:linux-64": "ENV_PLATFORM=linux-64 yarn create_env_installer",
32+
"create_env_installer:linux-aarch64": "ENV_PLATFORM=linux-aarch64 yarn create_env_installer",
33+
"create_env_installer:osx-64": "ENV_PLATFORM=osx-64 yarn create_env_installer",
34+
"create_env_installer:osx-arm64": "ENV_PLATFORM=osx-arm64 yarn create_env_installer",
35+
"create_env_installer:win-64": "yarn clean_env_installer && conda-lock install --no-validate-platform --prefix ./env_installer/jlab_server ./env_installer/conda-win-64.lock && conda pack -p ./env_installer/jlab_server -o ./env_installer/jlab_server.tar.gz",
3436
"extract_env_installer:osx": "cd ./env_installer && rimraf jlab_server_extracted && mkdir jlab_server_extracted && tar -xzf jlab_server.tar.gz -C jlab_server_extracted && cd -",
3537
"extract_env_installer:osx-64": "yarn extract_env_installer:osx",
3638
"extract_env_installer:osx-arm64": "yarn extract_env_installer:osx",
@@ -180,13 +182,14 @@
180182
"@typescript-eslint/parser": "~5.28.0",
181183
"@leeoniya/ufuzzy": "1.0.14",
182184
"electron": "^27.0.2",
183-
"electron-builder": "^24.6.4",
185+
"electron-builder": "^24.9.1",
184186
"electron-notarize": "^1.2.2",
185187
"eslint": "~8.17.0",
186188
"eslint-config-prettier": "~8.5.0",
187189
"eslint-plugin-prettier": "~4.0.0",
188190
"eslint-plugin-react": "~7.29.4",
189191
"fs-extra": "~9.1.0",
192+
"istextorbinary": "^6.0.0",
190193
"meow": "^6.0.1",
191194
"mini-css-extract-plugin": "^1.3.9",
192195
"node-watch": "^0.7.4",
@@ -209,7 +212,6 @@
209212
"electron-log": "^4.4.8",
210213
"fast-xml-parser": "^4.2.5",
211214
"fix-path": "^3.0.0",
212-
"istextorbinary": "^6.0.0",
213215
"js-yaml": "^4.1.0",
214216
"node-fetch": "^2.6.7",
215217
"semver": "^7.5.4",

‎src/main/utils.ts

-39
Original file line numberDiff line numberDiff line change
@@ -555,45 +555,6 @@ export function createCommandScriptInEnv(
555555
return scriptLines.join(joinStr);
556556
}
557557

558-
export function getBinarySignList(envPath: string) {
559-
const { isBinary } = require('istextorbinary');
560-
const envBinDir = path.join(envPath, 'bin');
561-
562-
const needsSigning = (filePath: string) => {
563-
// conly consider bin directory, and .so, .dylib files in other directories
564-
if (
565-
filePath.startsWith(envBinDir) ||
566-
filePath.endsWith('.so') ||
567-
filePath.endsWith('.dylib')
568-
) {
569-
// check for binary content
570-
return isBinary(null, fs.readFileSync(filePath));
571-
}
572-
573-
return false;
574-
};
575-
576-
const findBinariesInDirectory = (dirPath: string): string[] => {
577-
let results: string[] = [];
578-
const list = fs.readdirSync(dirPath);
579-
list.forEach(filePath => {
580-
filePath = dirPath + '/' + filePath;
581-
const stat = fs.lstatSync(filePath);
582-
if (stat && stat.isDirectory()) {
583-
results = results.concat(findBinariesInDirectory(filePath));
584-
} else {
585-
if (!stat.isSymbolicLink() && needsSigning(filePath)) {
586-
results.push(path.relative(envPath, filePath));
587-
}
588-
}
589-
});
590-
591-
return results;
592-
};
593-
594-
return findBinariesInDirectory(envPath);
595-
}
596-
597558
/*
598559
signed tarball contents need to be unsigned except for python binary,
599560
otherwise server runs into issues at runtime. python binary comes originally

‎yarn.lock

+43-43
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# yarn lockfile v1
33

44

5-
"7zip-bin@~5.1.1":
6-
version "5.1.1"
7-
resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876"
8-
integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ==
5+
"7zip-bin@~5.2.0":
6+
version "5.2.0"
7+
resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.2.0.tgz#7a03314684dd6572b7dfa89e68ce31d60286854d"
8+
integrity sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==
99

1010
"@babel/code-frame@^7.0.0":
1111
version "7.18.6"
@@ -813,12 +813,12 @@ [email protected]:
813813
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
814814
integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
815815

816-
app-builder-lib@24.6.4:
817-
version "24.6.4"
818-
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.6.4.tgz#5bf77dd89d3ee557bc615b9ddfaf383f3e51577b"
819-
integrity sha512-m9931WXb83teb32N0rKg+ulbn6+Hl8NV5SUpVDOVz9MWOXfhV6AQtTdftf51zJJvCQnQugGtSqoLvgw6mdF/Rg==
816+
app-builder-lib@24.9.1:
817+
version "24.9.1"
818+
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.9.1.tgz#bf3568529298b4de8595ed1acbb351fe27db5ba4"
819+
integrity sha512-Q1nYxZcio4r+W72cnIRVYofEAyjBd3mG47o+zms8HlD51zWtA/YxJb01Jei5F+jkWhge/PTQK+uldsPh6d0/4g==
820820
dependencies:
821-
"7zip-bin" "~5.1.1"
821+
"7zip-bin" "~5.2.0"
822822
"@develar/schema-utils" "~2.6.5"
823823
"@electron/notarize" "2.1.0"
824824
"@electron/osx-sign" "1.0.5"
@@ -827,12 +827,12 @@ [email protected]:
827827
"@types/fs-extra" "9.0.13"
828828
async-exit-hook "^2.0.1"
829829
bluebird-lst "^1.0.9"
830-
builder-util "24.5.0"
831-
builder-util-runtime "9.2.1"
830+
builder-util "24.8.1"
831+
builder-util-runtime "9.2.3"
832832
chromium-pickle-js "^0.2.0"
833833
debug "^4.3.4"
834834
ejs "^3.1.8"
835-
electron-publish "24.5.0"
835+
electron-publish "24.8.1"
836836
form-data "^4.0.0"
837837
fs-extra "^10.1.0"
838838
hosted-git-info "^4.1.0"
@@ -1031,24 +1031,24 @@ buffer@^5.1.0:
10311031
base64-js "^1.3.1"
10321032
ieee754 "^1.1.13"
10331033

1034-
[email protected].1:
1035-
version "9.2.1"
1036-
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.1.tgz#3184dcdf7ed6c47afb8df733813224ced4f624fd"
1037-
integrity sha512-2rLv/uQD2x+dJ0J3xtsmI12AlRyk7p45TEbE/6o/fbb633e/S3pPgm+ct+JHsoY7r39dKHnGEFk/AASRFdnXmA==
1034+
[email protected].3:
1035+
version "9.2.3"
1036+
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz#0a82c7aca8eadef46d67b353c638f052c206b83c"
1037+
integrity sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==
10381038
dependencies:
10391039
debug "^4.3.4"
10401040
sax "^1.2.4"
10411041

1042-
builder-util@24.5.0:
1043-
version "24.5.0"
1044-
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.5.0.tgz#8683c9a7a1c5c9f9a4c4d2789ecca0e47dddd3f9"
1045-
integrity sha512-STnBmZN/M5vGcv01u/K8l+H+kplTaq4PAIn3yeuufUKSpcdro0DhJWxPI81k5XcNfC//bjM3+n9nr8F9uV4uAQ==
1042+
builder-util@24.8.1:
1043+
version "24.8.1"
1044+
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.8.1.tgz#594d45b0c86d1d17f5c7bebbb77405080b2571c2"
1045+
integrity sha512-ibmQ4BnnqCnJTNrdmdNlnhF48kfqhNzSeqFMXHLIl+o9/yhn6QfOaVrloZ9YUu3m0k3rexvlT5wcki6LWpjTZw==
10461046
dependencies:
1047-
"7zip-bin" "~5.1.1"
1047+
"7zip-bin" "~5.2.0"
10481048
"@types/debug" "^4.1.6"
10491049
app-builder-bin "4.0.0"
10501050
bluebird-lst "^1.0.9"
1051-
builder-util-runtime "9.2.1"
1051+
builder-util-runtime "9.2.3"
10521052
chalk "^4.1.2"
10531053
cross-spawn "^7.0.3"
10541054
debug "^4.3.4"
@@ -1425,14 +1425,14 @@ dir-glob@^3.0.1:
14251425
dependencies:
14261426
path-type "^4.0.0"
14271427

1428-
dmg-builder@24.6.4:
1429-
version "24.6.4"
1430-
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.6.4.tgz#e19b8305f7e1ea0b4faaa30382c81b9d6de39863"
1431-
integrity sha512-BNcHRc9CWEuI9qt0E655bUBU/j/3wUCYBVKGu1kVpbN5lcUdEJJJeiO0NHK3dgKmra6LUUZlo+mWqc+OCbi0zw==
1428+
dmg-builder@24.9.1:
1429+
version "24.9.1"
1430+
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.9.1.tgz#04bf6c0dcd235f6214511f2358a78ed2b9379421"
1431+
integrity sha512-huC+O6hvHd24Ubj3cy2GMiGLe2xGFKN3klqVMLAdcbB6SWMd1yPSdZvV8W1O01ICzCCRlZDHiv4VrNUgnPUfbQ==
14321432
dependencies:
1433-
app-builder-lib "24.6.4"
1434-
builder-util "24.5.0"
1435-
builder-util-runtime "9.2.1"
1433+
app-builder-lib "24.9.1"
1434+
builder-util "24.8.1"
1435+
builder-util-runtime "9.2.3"
14361436
fs-extra "^10.1.0"
14371437
iconv-lite "^0.6.2"
14381438
js-yaml "^4.1.0"
@@ -1491,16 +1491,16 @@ ejs@^3.1.8:
14911491
dependencies:
14921492
jake "^10.8.5"
14931493

1494-
electron-builder@^24.6.4:
1495-
version "24.6.4"
1496-
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.6.4.tgz#c51271e49b9a02c9a3ec444f866b6008c4d98a1d"
1497-
integrity sha512-uNWQoU7pE7qOaIQ6CJHpBi44RJFVG8OHRBIadUxrsDJVwLLo8Nma3K/EEtx5/UyWAQYdcK4nVPYKoRqBb20hbA==
1494+
electron-builder@^24.9.1:
1495+
version "24.9.1"
1496+
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.9.1.tgz#4aee03947963b829a7f48a850fe02c219311ef63"
1497+
integrity sha512-v7BuakDuY6sKMUYM8mfQGrwyjBpZ/ObaqnenU0H+igEL10nc6ht049rsCw2HghRBdEwJxGIBuzs3jbEhNaMDmg==
14981498
dependencies:
1499-
app-builder-lib "24.6.4"
1500-
builder-util "24.5.0"
1501-
builder-util-runtime "9.2.1"
1499+
app-builder-lib "24.9.1"
1500+
builder-util "24.8.1"
1501+
builder-util-runtime "9.2.3"
15021502
chalk "^4.1.2"
1503-
dmg-builder "24.6.4"
1503+
dmg-builder "24.9.1"
15041504
fs-extra "^10.1.0"
15051505
is-ci "^3.0.0"
15061506
lazy-val "^1.0.5"
@@ -1526,14 +1526,14 @@ electron-notarize@^1.2.2:
15261526
debug "^4.1.1"
15271527
fs-extra "^9.0.1"
15281528

1529-
electron-publish@24.5.0:
1530-
version "24.5.0"
1531-
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.5.0.tgz#492a4d7caa232e88ee3c18f5c3b4dc637e5e1b3a"
1532-
integrity sha512-zwo70suH15L15B4ZWNDoEg27HIYoPsGJUF7xevLJLSI7JUPC8l2yLBdLGwqueJ5XkDL7ucYyRZzxJVR8ElV9BA==
1529+
electron-publish@24.8.1:
1530+
version "24.8.1"
1531+
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.8.1.tgz#4216740372bf4297a429543402a1a15ce8c3560b"
1532+
integrity sha512-IFNXkdxMVzUdweoLJNXSupXkqnvgbrn3J4vognuOY06LaS/m0xvfFYIf+o1CM8if6DuWYWoQFKPcWZt/FUjZPw==
15331533
dependencies:
15341534
"@types/fs-extra" "^9.0.11"
1535-
builder-util "24.5.0"
1536-
builder-util-runtime "9.2.1"
1535+
builder-util "24.8.1"
1536+
builder-util-runtime "9.2.3"
15371537
chalk "^4.1.2"
15381538
fs-extra "^10.1.0"
15391539
lazy-val "^1.0.5"

0 commit comments

Comments
 (0)