Skip to content

Commit

Permalink
RK-19903 - Upgrade Explorook CircleCI Image to XCode 15 (#369)
Browse files Browse the repository at this point in the history
* Upgrade to XCode 15

* remove find-identity
  • Loading branch information
Urook committed Oct 4, 2023
1 parent 4a47fbb commit 27a092c
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 10 deletions.
7 changes: 3 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ references:
jobs:
publish:
macos:
xcode: "14.0.1"
xcode: "15.0.0"
steps:
- checkout
- restore_cache:
Expand Down Expand Up @@ -56,7 +56,6 @@ jobs:
echo $APPLE_CERT | base64 --decode > certificates/wwdr.cer
security add-certificates certificates/wwdr.cer
security import certificates/mac_cert.p12 -P $NEW_CSC_KEY_PASSWORD
security find-identity
export CSC_LINK=certificates/mac_cert.p12
export CSC_KEY_PASSWORD=$NEW_CSC_KEY_PASSWORD
Expand All @@ -70,15 +69,15 @@ jobs:
- /usr/local/Homebrew
version_validation:
macos:
xcode: "14.0.1"
xcode: "15.0.0"
steps:
- checkout
- run:
name: Validate version has no release yet
command: sh ./validate_version.sh
publish_release_notes:
docker:
- image: node:16.17.1
- image: node:18.17.1
steps:
- checkout
- run:
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "explorook",
"version": "1.15.8",
"version": "1.15.9",
"description": "Rookout's site addon to support local files and folders",
"main": "dist/index.js",
"scripts": {
"postinstall": "patch-package",
"build": "webpack --config webpack.main.config.js && webpack --config webpack.index-worker.config.js",
"build": "cross-env NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack.main.config.js && cross-env NODE_OPTIONS=--openssl-legacy-provider webpack --config webpack.index-worker.config.js",
"postbuild": "copyfiles index-worker.html ./dist/",
"package-linux": "electron-builder --linux APPIMAGE",
"package-windows": "electron-builder --win",
"build-headless": "tsc",
"dist": "electron-builder",
"build-packages-all-distributions": "cross-env ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true electron-builder --mac --win --linux --arm64 --x64 -p always",
"build-packages-all-distributions": "cross-env NODE_OPTIONS=--openssl-legacy-provider ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true electron-builder --mac --win --linux --arm64 --x64 -p always",
"lint": "tslint -c tslint.json -p tsconfig.json",
"start": "cross-env development=1 yarn run build && cross-env development=1 electron ./dist/index.js",
"start-headless": "yarn run build-headless && node ./dist/headless.js -p=44512",
Expand Down
5 changes: 3 additions & 2 deletions src/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"typeface-roboto": "^0.0.54"
},
"devDependencies": {
"cross-env": "^7.0.3",
"react-scripts": "^4.0.3"
},
"resolutions": {
Expand All @@ -21,8 +22,8 @@
"react-scripts/semver": "^7.5.2"
},
"scripts": {
"start": "craco start",
"build": "craco build",
"start": "cross-env NODE_OPTIONS=--openssl-legacy-provider craco start",
"build": "cross-env NODE_OPTIONS=--openssl-legacy-provider craco build",
"postbuild": "mkdir -p ../../dist/webapp && cp -r build/* ../../dist/webapp",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
Expand Down
9 changes: 8 additions & 1 deletion src/webapp/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4746,7 +4746,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
safe-buffer "^5.0.1"
sha.js "^2.4.8"

cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2:
cross-env@^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
dependencies:
cross-spawn "^7.0.1"

cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
Expand Down

0 comments on commit 27a092c

Please sign in to comment.