67 changes: 3 additions & 64 deletions .github/workflows/insider-linux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ jobs:
run: ./get_repo.sh

- name: Build
env:
SHOULD_BUILD_REH: 'no'
run: ./build.sh

- name: Compress vscode artifact
Expand Down Expand Up @@ -289,7 +291,7 @@ jobs:
include:
- package_name: vscodium-insiders-bin
- package_name: vscodium-insiders
if: needs.check.outputs.SHOULD_DEPLOY == 'yes'
if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && github.event.inputs.generate_assets != 'true'

steps:
- name: Get version
Expand All @@ -305,66 +307,3 @@ jobs:
aur_private_key: ${{ secrets.AUR_PRIVATE_KEY }}
aur_username: ${{ secrets.AUR_USERNAME }}
aur_email: ${{ secrets.AUR_EMAIL }}

snap:
needs:
- check
- build
runs-on: ubuntu-latest
env:
RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
strategy:
fail-fast: false
matrix:
platform:
- amd64
- arm64
# if: needs.check.outputs.SHOULD_DEPLOY == 'yes'
if: false

steps:
- uses: actions/checkout@v3
with:
ref: ${{ env.GITHUB_BRANCH }}

- name: Check version
env:
ARCHITECTURE: ${{ matrix.platform }}
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
run: ./stores/snapcraft/check_version.sh

- uses: docker/setup-qemu-action@v3
if: env.SHOULD_BUILD == 'yes'

- name: Prepare snapcraft.yaml
env:
ARCHITECTURE: ${{ matrix.platform }}
run: ./stores/snapcraft/build.sh
if: env.SHOULD_BUILD == 'yes'

# - uses: diddlesnaps/snapcraft-multiarch-action@v1
# with:
# path: stores/snapcraft/build
# architecture: ${{ matrix.platform }}
# id: build
# if: env.SHOULD_BUILD == 'yes'

- uses: snapcore/action-build@v1
with:
path: stores/snapcraft/build
id: build
if: env.SHOULD_BUILD == 'yes'

# - uses: diddlesnaps/snapcraft-review-action@v1
# with:
# snap: ${{ steps.build.outputs.snap }}
# isClassic: 'true'
# if: env.SHOULD_BUILD == 'yes'

- uses: svenstaro/upload-release-action@v2
with:
repo_name: ${{ env.ASSETS_REPOSITORY }}
repo_token: ${{ secrets.STRONGER_GITHUB_TOKEN }}
file: ${{ steps.build.outputs.snap }}
tag: ${{ env.RELEASE_VERSION }}
if: env.SHOULD_DEPLOY_TO_RELEASE == 'yes'
51 changes: 32 additions & 19 deletions .github/workflows/stable-linux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,54 +70,64 @@ jobs:
MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
MS_TAG: ${{ needs.check.outputs.MS_TAG }}
RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
SHOULD_BUILD: 'yes'
SHOULD_BUILD: ${{ (needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true') && 'yes' || 'no' }}
VSCODE_ARCH: 'x64'
outputs:
BUILD_SOURCEVERSION: ${{ env.BUILD_SOURCEVERSION }}
if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'

steps:
- uses: actions/checkout@v4
with:
ref: ${{ env.GITHUB_BRANCH }}
if: env.SHOULD_BUILD == 'yes'

- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: '18.17'
if: env.SHOULD_BUILD == 'yes'

- name: Install Yarn
run: npm install -g yarn
if: env.SHOULD_BUILD == 'yes'

- name: Setup Python 3
uses: actions/setup-python@v5
with:
python-version: '3.11'
if: env.SHOULD_BUILD == 'yes'

- name: Install libkrb5-dev
run: sudo apt-get install -y libkrb5-dev
if: env.SHOULD_BUILD == 'yes'

- name: Clone VSCode repo
env:
PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
run: ./get_repo.sh
if: env.SHOULD_BUILD == 'yes'

- name: Build
env:
SHOULD_BUILD_REH: 'no'
run: ./build.sh
if: env.SHOULD_BUILD == 'yes'

- name: Compress vscode artifact
run: |
find vscode -type f -not -path "*/node_modules/*" -not -path "vscode/.build/node/*" -not -path "vscode/.git/*" > vscode.txt
echo "vscode/.build/extensions/node_modules" >> vscode.txt
echo "vscode/.git" >> vscode.txt
tar -czf vscode.tar.gz -T vscode.txt
if: env.SHOULD_BUILD == 'yes'

- name: Upload vscode artifact
uses: actions/upload-artifact@v3
with:
name: vscode
path: ./vscode.tar.gz
retention-days: ${{ needs.check.outputs.SHOULD_DEPLOY == 'yes' && 30 || 1 }}
if: env.SHOULD_BUILD == 'yes'

build:
needs:
Expand All @@ -144,52 +154,53 @@ jobs:
MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
MS_TAG: ${{ needs.check.outputs.MS_TAG }}
RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
SHOULD_BUILD: ${{ needs.check.outputs.SHOULD_BUILD }}
SHOULD_BUILD: ${{ (needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true') && 'yes' || 'no' }}
SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }}
VSCODE_ARCH: ${{ matrix.vscode_arch }}
outputs:
RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
SHOULD_BUILD: ${{ env.SHOULD_BUILD }}
SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'

steps:
- uses: actions/checkout@v3
with:
ref: ${{ env.GITHUB_BRANCH }}
if: env.SHOULD_BUILD == 'yes'

- name: Install GH
run: ./install_gh.sh
if: env.SHOULD_DEPLOY == 'yes'
if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'

- name: Check existing VSCodium tags/releases
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CHECK_REH: 'no'
run: ./check_tags.sh
if: env.SHOULD_BUILD == 'yes'

- name: Install libkrb5-dev
run: sudo apt-get install -y libkrb5-dev
if: env.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
if: env.SHOULD_BUILD == 'yes'

- name: Download vscode artifact
uses: actions/download-artifact@v3
with:
name: vscode
if: env.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
if: env.SHOULD_BUILD == 'yes'

- name: Build
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
npm_config_arch: ${{ matrix.npm_arch }}
run: ./package_linux_bin.sh
if: env.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true'
if: env.SHOULD_BUILD == 'yes'

- name: Prepare assets
env:
SHOULD_BUILD_REH: 'no'
run: ./prepare_assets.sh
if: (env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes') || github.event.inputs.generate_assets == 'true'
if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')

- name: Release
env:
Expand All @@ -211,7 +222,7 @@ jobs:
name: bin-${{ matrix.vscode_arch }}
path: assets/
retention-days: 3
if: env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'

reh:
needs:
Expand Down Expand Up @@ -320,25 +331,19 @@ jobs:
platform:
- amd64
- arm64
# if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
if: false
if: needs.check.outputs.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true'

steps:
- uses: actions/checkout@v3

- name: Check version
env:
ARCHITECTURE: ${{ matrix.platform }}
GENERATE_ASSETS: ${{ github.event.inputs.generate_assets }}
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
run: ./stores/snapcraft/check_version.sh

- uses: docker/setup-qemu-action@v3
if: env.SHOULD_DEPLOY == 'yes'

- name: Prepare snapcraft.yaml
env:
ARCHITECTURE: ${{ matrix.platform }}
run: ./stores/snapcraft/build.sh
if: env.SHOULD_BUILD == 'yes'

- uses: diddlesnaps/snapcraft-multiarch-action@v1
Expand All @@ -352,7 +357,7 @@ jobs:
with:
snap: ${{ steps.build.outputs.snap }}
isClassic: 'true'
if: env.SHOULD_BUILD == 'yes'
if: env.SHOULD_DEPLOY_TO_RELEASE == 'yes' || env.SHOULD_DEPLOY_TO_STORE == 'yes'

- uses: svenstaro/upload-release-action@v2
with:
Expand All @@ -370,6 +375,14 @@ jobs:
release: stable
if: env.SHOULD_DEPLOY_TO_STORE == 'yes'

- name: Upload assets
uses: actions/upload-artifact@v3
with:
name: snap-${{ matrix.platform }}
path: ${{ steps.build.outputs.snap }}
retention-days: 3
if: github.event.inputs.generate_assets == 'true'

deb-rpm-repo-hook:
needs:
- check
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ build/linux/appimage/VSCodium
build/windows/msi/releasedir
build/windows/msi/Files*.wxs
build/windows/msi/Files*.wixobj
remote-dependencies.tar
stores/snapcraft/build
stores/snapcraft/insider/*.snap
stores/snapcraft/stable/*.snap
4 changes: 1 addition & 3 deletions build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,10 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
VSCODE_PLATFORM="win32"
else # linux
# in CI, packaging will be done by a different job
if [[ "${CI_BUILD}" != "no" ]]; then
if [[ "${CI_BUILD}" == "no" ]]; then
yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"

find "../VSCode-linux-${VSCODE_ARCH}" -print0 | xargs -0 touch -c

SHOULD_BUILD_REH="no"
fi

VSCODE_PLATFORM="linux"
Expand Down
37 changes: 21 additions & 16 deletions stores/snapcraft/check_version.sh
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,38 @@
#!/usr/bin/env bash
# shellcheck disable=SC2129

set -e

export SHOULD_BUILD="no"
export SHOULD_DEPLOY_TO_RELEASE="no"
export SHOULD_DEPLOY_TO_STORE="no"

wget --quiet "https://api.github.com/repos/${ASSETS_REPOSITORY}/releases" -O gh_latest.json
SNAP_URL=$( jq -r 'map(select(.tag_name == "'"${RELEASE_VERSION}"'"))|first.assets[].browser_download_url|select(endswith("'"_${ARCHITECTURE}.snap"'"))' gh_latest.json )

if [[ -z "${SNAP_URL}" ]]; then
if [[ "${GENERATE_ASSETS}" == "true" ]]; then
export SHOULD_BUILD="yes"
export SHOULD_DEPLOY_TO_RELEASE="yes"
fi
else
wget --quiet "https://api.github.com/repos/${ASSETS_REPOSITORY}/releases" -O gh_latest.json
SNAP_URL=$( jq -r 'map(select(.tag_name == "'"${RELEASE_VERSION}"'"))|first.assets[].browser_download_url|select(endswith("'"_${ARCHITECTURE}.snap"'"))' gh_latest.json )

if [[ -z "${SNAP_URL}" ]]; then
export SHOULD_BUILD="yes"
export SHOULD_DEPLOY_TO_RELEASE="yes"
fi

if [[ "${VSCODE_QUALITY}" == "stable" ]]; then
sudo snap install --channel stable --classic snapcraft
if [[ "${VSCODE_QUALITY}" == "stable" ]]; then
sudo snap install --channel stable --classic snapcraft

echo "Architecture: ${ARCHITECTURE}"
echo "Architecture: ${ARCHITECTURE}"

SNAP_VERSION=$( snapcraft list-revisions "${SNAP_NAME}" | grep -F "stable*" | grep "${ARCHITECTURE}" | tr -s ' ' | cut -d ' ' -f 4 )
echo "Snap version: ${SNAP_VERSION}"
SNAP_VERSION=$( snapcraft list-revisions "${SNAP_NAME}" | grep -F "stable*" | grep "${ARCHITECTURE}" | tr -s ' ' | cut -d ' ' -f 4 )
echo "Snap version: ${SNAP_VERSION}"

if [[ "${SNAP_VERSION}" != "${RELEASE_VERSION}" ]]; then
export SHOULD_BUILD="yes"
export SHOULD_DEPLOY_TO_STORE="yes"
if [[ "${SNAP_VERSION}" != "${RELEASE_VERSION}" ]]; then
export SHOULD_BUILD="yes"
export SHOULD_DEPLOY_TO_STORE="yes"

snap version
snap info "${SNAP_NAME}" || true
snap version
snap info "${SNAP_NAME}" || true
fi
fi
fi

Expand Down
0 stores/snapcraft/stable/electron-launch → ...aft/stable/snap/local/bin/electron-launch
View file
File renamed without changes.