use checkout@v3 to check upstream source and fix update.js
This commit is contained in:
		
							parent
							
								
									d0046a87e9
								
							
						
					
					
						commit
						6fd8e8d4cb
					
				|  | @ -16,8 +16,8 @@ jobs: | ||||||
|     runs-on: ${{ matrix.os }} |     runs-on: ${{ matrix.os }} | ||||||
|     timeout-minutes: 360 |     timeout-minutes: 360 | ||||||
|     steps: |     steps: | ||||||
|       - name: Checkout |       - name: Checkout OpenLens | ||||||
|         uses: actions/checkout@v3.2.0 |         uses: actions/checkout@v3 | ||||||
|       - name: Export version to variable |       - name: Export version to variable | ||||||
|         run: | |         run: | | ||||||
|             export LENS_VERSION=$(cat version) |             export LENS_VERSION=$(cat version) | ||||||
|  | @ -26,12 +26,17 @@ jobs: | ||||||
|       - uses: actions/setup-node@v3 |       - uses: actions/setup-node@v3 | ||||||
|         with: |         with: | ||||||
|           node-version: 16.16.0 |           node-version: 16.16.0 | ||||||
|       - name: Update Lens |       - name: Checkout Upstream Lens | ||||||
|  |         uses: actions/checkout@v3 | ||||||
|  |         with: | ||||||
|  |           repository: lensapp/lens | ||||||
|  |           path: lens | ||||||
|  |           ref: v${{ env.LENS_VERSION }} | ||||||
|  |           fetch-depth: 1 | ||||||
|  |       - name: Patch Upstream Lens | ||||||
|         run: | |         run: | | ||||||
|           git clone https://github.com/lensapp/lens.git |  | ||||||
|           cp update.js lens/update.js |           cp update.js lens/update.js | ||||||
|           cd lens |           cd lens | ||||||
|           git checkout v${{ env.LENS_VERSION }} |  | ||||||
|           node update.js |           node update.js | ||||||
|       - name: Build Lens |       - name: Build Lens | ||||||
|         run: | |         run: | | ||||||
|  | @ -47,8 +52,8 @@ jobs: | ||||||
|             if [ "${CSC_KEY_PASSWORD}" = "" ]; then |             if [ "${CSC_KEY_PASSWORD}" = "" ]; then | ||||||
|               unset CSC_KEY_PASSWORD |               unset CSC_KEY_PASSWORD | ||||||
|             fi |             fi | ||||||
|             npm install |             yarn | ||||||
|             env ELECTRON_BUILDER_EXTRA_ARGS="--arm64 --x64 --config.dmg.sign=false" npm run build |             env ELECTRON_BUILDER_EXTRA_ARGS="--arm64 --x64 --config.dmg.sign=false" yarn run build | ||||||
|             for file in dist/OpenLens-${{ env.LENS_VERSION }}.dmg; do |             for file in dist/OpenLens-${{ env.LENS_VERSION }}.dmg; do | ||||||
|               if [[ "$file" == *"arm64"* ]]; then |               if [[ "$file" == *"arm64"* ]]; then | ||||||
|                 cp "$file" releasefiles/OpenLens-${{ env.LENS_VERSION }}-arm64.dmg |                 cp "$file" releasefiles/OpenLens-${{ env.LENS_VERSION }}-arm64.dmg | ||||||
|  | @ -64,8 +69,8 @@ jobs: | ||||||
|               fi |               fi | ||||||
|             done |             done | ||||||
|           elif [ "$RUNNER_OS" == "Linux" ]; then |           elif [ "$RUNNER_OS" == "Linux" ]; then | ||||||
|             npm install |             yarn | ||||||
|             env ELECTRON_BUILDER_EXTRA_ARGS="--x64 --arm64" npm run build |             env ELECTRON_BUILDER_EXTRA_ARGS="--x64 --arm64" yarn run build | ||||||
|             cp dist/OpenLens-${{ env.LENS_VERSION }}.x86_64.AppImage releasefiles/OpenLens-${{ env.LENS_VERSION }}.AppImage |             cp dist/OpenLens-${{ env.LENS_VERSION }}.x86_64.AppImage releasefiles/OpenLens-${{ env.LENS_VERSION }}.AppImage | ||||||
|             cp dist/OpenLens-${{ env.LENS_VERSION }}.amd64.deb releasefiles/OpenLens-${{ env.LENS_VERSION }}.deb |             cp dist/OpenLens-${{ env.LENS_VERSION }}.amd64.deb releasefiles/OpenLens-${{ env.LENS_VERSION }}.deb | ||||||
|             cp dist/OpenLens-${{ env.LENS_VERSION }}.x86_64.rpm releasefiles/OpenLens-${{ env.LENS_VERSION }}.rpm |             cp dist/OpenLens-${{ env.LENS_VERSION }}.x86_64.rpm releasefiles/OpenLens-${{ env.LENS_VERSION }}.rpm | ||||||
|  | @ -73,8 +78,8 @@ jobs: | ||||||
|             cp dist/OpenLens-${{ env.LENS_VERSION }}.arm64.deb releasefiles/OpenLens-${{ env.LENS_VERSION }}.arm64.deb |             cp dist/OpenLens-${{ env.LENS_VERSION }}.arm64.deb releasefiles/OpenLens-${{ env.LENS_VERSION }}.arm64.deb | ||||||
|             cp dist/OpenLens-${{ env.LENS_VERSION }}.aarch64.rpm releasefiles/OpenLens-${{ env.LENS_VERSION }}.arm64.rpm |             cp dist/OpenLens-${{ env.LENS_VERSION }}.aarch64.rpm releasefiles/OpenLens-${{ env.LENS_VERSION }}.arm64.rpm | ||||||
|           else |           else | ||||||
|             npm install |             yarn | ||||||
|             npm run build |             yarn run build | ||||||
|             cp dist/OpenLens*.exe releasefiles/OpenLens-${{ env.LENS_VERSION }}.exe |             cp dist/OpenLens*.exe releasefiles/OpenLens-${{ env.LENS_VERSION }}.exe | ||||||
|             cp dist/OpenLens*.exe dist/OpenLens-${{ env.LENS_VERSION }}.exe |             cp dist/OpenLens*.exe dist/OpenLens-${{ env.LENS_VERSION }}.exe | ||||||
|           fi |           fi | ||||||
|  |  | ||||||
|  | @ -9,4 +9,4 @@ packagejson.build.publish = [{ | ||||||
| 
 | 
 | ||||||
| packagejson.build.win.artifactName = "OpenLens.Setup.${version}.${ext}"; | packagejson.build.win.artifactName = "OpenLens.Setup.${version}.${ext}"; | ||||||
| 
 | 
 | ||||||
| fs.writeFileSync('package.json', JSON.stringify(packagejson)); | fs.writeFileSync('./packages/open-lens/package.json', JSON.stringify(packagejson)); | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue