From 0fd90a8882668916c2a8ae5ecc8e26491fe5e26c Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Sat, 18 May 2024 08:41:56 +0200 Subject: [PATCH] channels --- .circleci/config.yml | 18 ++++++++++-- .../ci/update_desktop_release_assets.ts | 28 +++++++++++++------ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1b1489c070..0a0db740aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -441,8 +441,22 @@ jobs: cd apps/remixdesktop yarn installRipGrepMacOX<< parameters.arch >> PUBLISH_FOR_PULL_REQUEST='false' USE_HARD_LINKS=false ./rundist.bash --<< parameters.arch >> - cat release/latest-mac.yml - mv release/latest-mac.yml release/latest-mac-<< parameters.arch >>.yml + if [ -f release/latest-mac.yml ]; then + cat release/latest-mac.yml + mv release/latest-mac.yml release/latest-mac-<< parameters.arch >>.yml + fi + if [ -f release/alpha-mac.yml ]; then + cat release/alpha-mac.yml + mv release/alpha-mac.yml release/alpha-mac-<< parameters.arch >>.yml + fi + if [ -f release/beta-mac.yml ]; then + cat release/beta-mac.yml + mv release/beta-mac.yml release/beta-mac-<< parameters.arch >>.yml + fi + if [ -f release/insiders-mac.yml ]; then + cat release/insiders-mac.yml + mv release/insiders-mac.yml release/insiders-mac-<< parameters.arch >>.yml + fi - run: name: Notarize the app command: | diff --git a/apps/remix-ide/ci/update_desktop_release_assets.ts b/apps/remix-ide/ci/update_desktop_release_assets.ts index a0db6ce7e7..838da1f82b 100644 --- a/apps/remix-ide/ci/update_desktop_release_assets.ts +++ b/apps/remix-ide/ci/update_desktop_release_assets.ts @@ -94,6 +94,18 @@ async function hashFile(file): Promise { async function main() { const allReleases = await getAllReleases() const version = await getVersionFromPackageJson() + let channel = 'latest' + if(version.includes('beta')) { + channel = 'beta' + } + if(version.includes('alpha')) { + channel = 'alpha' + } + if(version.includes('insiders')) { + channel = 'insiders' + } + + console.log(`preparing release version: ${version}`) let release allReleases.find((r) => { @@ -119,7 +131,7 @@ async function main() { let ymlFiles = await readReleaseFilesFromLocalDirectory() - ymlFiles = ymlFiles.filter((file) => file.endsWith('.yml') && file.startsWith('latest')) + ymlFiles = ymlFiles.filter((file) => file.endsWith('.yml') && file.startsWith(channel)) console.log(`Found ${ymlFiles.length} yml files to upload`) @@ -174,10 +186,10 @@ async function main() { let files = await readReleaseFilesFromLocalDirectory() try { - if (fs.existsSync(path.join(__dirname, '../../../release', 'latest-mac-arm64.yml')) && fs.existsSync(path.join(__dirname, '../../../release', 'latest-mac-x64.yml'))) { + if (fs.existsSync(path.join(__dirname, '../../../release', `${channel}-mac-arm64.yml`)) && fs.existsSync(path.join(__dirname, '../../../release', `${channel}-mac-x64.yml`))) { // combine the two files - const macArm64 = fs.readFileSync(path.join(__dirname, '../../../release', 'latest-mac-arm64.yml'), 'utf8') - const mac = fs.readFileSync(path.join(__dirname, '../../../release', 'latest-mac-x64.yml'), 'utf8') + const macArm64 = fs.readFileSync(path.join(__dirname, '../../../release', `${channel}-mac-arm64.yml`), 'utf8') + const mac = fs.readFileSync(path.join(__dirname, '../../../release', `${channel}-mac-x64.yml`), 'utf8') const parsedMacArm64 = YAML.parse(macArm64) const parsedMac = YAML.parse(mac) console.log(parsedMacArm64) @@ -191,17 +203,17 @@ async function main() { } console.log(combined) const newYml = YAML.stringify(combined) - fs.writeFileSync(path.join(__dirname, '../../../release', 'latest-mac.yml'), newYml) + fs.writeFileSync(path.join(__dirname, '../../../release', `${channel}-mac.yml`), newYml) // remove the arm64 file - fs.unlinkSync(path.join(__dirname, '../../../release', 'latest-mac-arm64.yml')) - fs.unlinkSync(path.join(__dirname, '../../../release', 'latest-mac-x64.yml')) + fs.unlinkSync(path.join(__dirname, '../../../release', `${channel}-mac-arm64.yml`)) + fs.unlinkSync(path.join(__dirname, '../../../release', `${channel}-mac-x64.yml`)) } } catch (e) { console.log(e) } files = await readReleaseFilesFromLocalDirectory() - files = files.filter((file) => file.endsWith('.zip') || file.endsWith('.dmg') || file.endsWith('.exe') || file.endsWith('.AppImage') || file.endsWith('.snap') || file.endsWith('.deb') || file.startsWith('latest')) + files = files.filter((file) => file.endsWith('.zip') || file.endsWith('.dmg') || file.endsWith('.exe') || file.endsWith('.AppImage') || file.endsWith('.snap') || file.endsWith('.deb') || file.startsWith(`${channel}`)) console.log(`Found ${files.length} files to upload`) console.log(files) if (!release.draft) {