VSCodium/vscodium
1
1
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2024-12-23 00:41:48 +03:00
Code Issues Projects Releases Wiki Activity

fix(reh): build reh archives

Browse Source
This commit is contained in:
Baptiste Augrain 2024-11-05 18:04:24 +01:00
parent d598450d02
commit e3a0ba975b
4 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/insider-linux.yml vendored
View File

@ -138,7 +138,7 @@ jobs:
if: env.SHOULD_BUILD == 'yes' if: env.SHOULD_BUILD == 'yes'
- name: Upload vscode artifact - name: Upload vscode artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: vscode name: vscode
path: ./vscode.tar.gz path: ./vscode.tar.gz
@ -182,7 +182,7 @@ jobs:
SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }} SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
ref: ${{ env.GITHUB_BRANCH }} ref: ${{ env.GITHUB_BRANCH }}
if: env.SHOULD_BUILD == 'yes' if: env.SHOULD_BUILD == 'yes'
@ -210,7 +210,7 @@ jobs:
if: env.SHOULD_BUILD == 'yes' if: env.SHOULD_BUILD == 'yes'
- name: Download vscode artifact - name: Download vscode artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: vscode name: vscode
if: env.SHOULD_BUILD == 'yes' if: env.SHOULD_BUILD == 'yes'
@ -245,7 +245,7 @@ jobs:
if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes' if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
- name: Upload assets - name: Upload assets
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: bin-${{ matrix.vscode_arch }} name: bin-${{ matrix.vscode_arch }}
path: assets/ path: assets/
@ -291,7 +291,7 @@ jobs:
if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true' if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
ref: ${{ env.GITHUB_BRANCH }} ref: ${{ env.GITHUB_BRANCH }}
if: env.DISABLED != 'yes' if: env.DISABLED != 'yes'
@ -337,7 +337,7 @@ jobs:
if: env.DISABLED != 'yes' if: env.DISABLED != 'yes'
- name: Download vscode artifact - name: Download vscode artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: vscode name: vscode
if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true') if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
@ -389,7 +389,7 @@ jobs:
if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true' if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
ref: ${{ env.GITHUB_BRANCH }} ref: ${{ env.GITHUB_BRANCH }}
@ -419,7 +419,7 @@ jobs:
if: env.SHOULD_BUILD == 'yes' if: env.SHOULD_BUILD == 'yes'
- name: Download vscode artifact - name: Download vscode artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: vscode name: vscode
if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true' if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
@ -491,7 +491,7 @@ jobs:
if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_INSIDER_SNAP != 'yes' if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_INSIDER_SNAP != 'yes'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
ref: ${{ env.GITHUB_BRANCH }} ref: ${{ env.GITHUB_BRANCH }}

23
.github/workflows/stable-linux.yml vendored
View File

@ -137,7 +137,7 @@ jobs:
if: env.SHOULD_BUILD == 'yes' if: env.SHOULD_BUILD == 'yes'
- name: Upload vscode artifact - name: Upload vscode artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: vscode name: vscode
path: ./vscode.tar.gz path: ./vscode.tar.gz
@ -181,7 +181,7 @@ jobs:
SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }} SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
ref: ${{ env.GITHUB_BRANCH }} ref: ${{ env.GITHUB_BRANCH }}
if: env.SHOULD_BUILD == 'yes' if: env.SHOULD_BUILD == 'yes'
@ -208,7 +208,7 @@ jobs:
if: env.SHOULD_BUILD == 'yes' if: env.SHOULD_BUILD == 'yes'
- name: Download vscode artifact - name: Download vscode artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: vscode name: vscode
if: env.SHOULD_BUILD == 'yes' if: env.SHOULD_BUILD == 'yes'
@ -243,7 +243,7 @@ jobs:
if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes' if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
- name: Upload assets - name: Upload assets
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: bin-${{ matrix.vscode_arch }} name: bin-${{ matrix.vscode_arch }}
path: assets/ path: assets/
@ -289,7 +289,7 @@ jobs:
if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true' if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
ref: ${{ env.GITHUB_BRANCH }} ref: ${{ env.GITHUB_BRANCH }}
if: env.DISABLED != 'yes' if: env.DISABLED != 'yes'
@ -335,7 +335,7 @@ jobs:
if: env.DISABLED != 'yes' if: env.DISABLED != 'yes'
- name: Download vscode artifact - name: Download vscode artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: vscode name: vscode
if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true') if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
@ -387,7 +387,7 @@ jobs:
if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true' if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
ref: ${{ env.GITHUB_BRANCH }} ref: ${{ env.GITHUB_BRANCH }}
@ -417,7 +417,7 @@ jobs:
if: env.SHOULD_BUILD == 'yes' if: env.SHOULD_BUILD == 'yes'
- name: Download vscode artifact - name: Download vscode artifact
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: vscode name: vscode
if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true' if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
@ -455,8 +455,8 @@ jobs:
include: include:
- package_name: vscodium - package_name: vscodium
package_type: stable package_type: stable
- package_name: vscodium-git # - package_name: vscodium-git
package_type: rolling # package_type: rolling
if: needs.check.outputs.SHOULD_DEPLOY == 'yes' if: needs.check.outputs.SHOULD_DEPLOY == 'yes'
steps: steps:
@ -486,7 +486,7 @@ jobs:
if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_STABLE_SNAP != 'yes' if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_STABLE_SNAP != 'yes'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
ref: ${{ env.GITHUB_BRANCH }} ref: ${{ env.GITHUB_BRANCH }}
@ -499,6 +499,7 @@ jobs:
env: env:
ARCHITECTURE: ${{ matrix.platform }} ARCHITECTURE: ${{ matrix.platform }}
GENERATE_ASSETS: ${{ github.event.inputs.generate_assets }} GENERATE_ASSETS: ${{ github.event.inputs.generate_assets }}
SNAPCRAFT_STORE_CHANNEL: ${{ vars.SNAP_STORE_CHANNEL }}
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }} SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
run: ./stores/snapcraft/check_version.sh run: ./stores/snapcraft/check_version.sh

4
package_linux_reh.sh
View File

@ -154,7 +154,7 @@ if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
pushd "../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" pushd "../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}"
if [[ -f "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" ]]; then if [[ -f "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" ]]; then
exec "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" bash "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh"
fi fi
echo "Archiving REH" echo "Archiving REH"
@ -173,7 +173,7 @@ if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
pushd "../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}" pushd "../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}"
if [[ -f "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" ]]; then if [[ -f "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" ]]; then
exec "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" bash "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh"
fi fi
echo "Archiving REH-web" echo "Archiving REH-web"

4
stores/snapcraft/check_version.sh
View File

@ -22,7 +22,9 @@ else
fi fi
if [[ "${VSCODE_QUALITY}" == "stable" ]]; then if [[ "${VSCODE_QUALITY}" == "stable" ]]; then
sudo snap install --channel stable --classic snapcraft CHANNEL="${SNAPCRAFT_STORE_CHANNEL:-stable}"
sudo snap install --channel "${CHANNEL}" --classic snapcraft
echo "Architecture: ${ARCHITECTURE}" echo "Architecture: ${ARCHITECTURE}"