diff --git a/.gitea/workflows/windows-ci.yml b/.gitea/workflows/windows-ci.yml index be83ac3..ada7f5c 100644 --- a/.gitea/workflows/windows-ci.yml +++ b/.gitea/workflows/windows-ci.yml @@ -58,7 +58,12 @@ jobs: run: npm run test:packaged-launch timeout-minutes: 10 - name: Build installer - run: npm run dist:ci + run: | + npm run dist:ci + if ($LASTEXITCODE -ne 0) { + npm run dist:ci + if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } + } timeout-minutes: 10 - name: Installer smoke run: npm run test:installer diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index be83ac3..ada7f5c 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -58,7 +58,12 @@ jobs: run: npm run test:packaged-launch timeout-minutes: 10 - name: Build installer - run: npm run dist:ci + run: | + npm run dist:ci + if ($LASTEXITCODE -ne 0) { + npm run dist:ci + if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } + } timeout-minutes: 10 - name: Installer smoke run: npm run test:installer diff --git a/CHANGELOG.md b/CHANGELOG.md index 989061d..39ae616 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.0.13 - 2026-08-12 + +- Apply the Windows CI retry to both directory and installer packaging. + ## 1.0.12 - 2026-08-12 - Retry transient Electron download failures once while packaging on Windows CI. diff --git a/README.md b/README.md index 500df4c..9d9aa41 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ The application works in public mode without a Twitch login. Connecting a Twitch ## Installation 1. Open the [latest GitHub release](https://github.com/Sucukdeluxe/Twitch-VOD-Manager/releases/latest). -2. Download `Twitch-VOD-Manager-Setup-1.0.12.exe`. +2. Download `Twitch-VOD-Manager-Setup-1.0.13.exe`. 3. Run the installer and choose the installation directory. 4. Start Twitch VOD Manager and add a streamer. diff --git a/package-lock.json b/package-lock.json index 71a4f87..28496b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "twitch-vod-manager", - "version": "1.0.12", + "version": "1.0.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "twitch-vod-manager", - "version": "1.0.12", + "version": "1.0.13", "license": "MIT", "dependencies": { "axios": "^1.16.1", diff --git a/package.json b/package.json index 39d9870..2df0051 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "twitch-vod-manager", - "version": "1.0.12", + "version": "1.0.13", "description": "Twitch VOD Manager - Download Twitch VODs easily", "main": "dist/main.js", "author": "Sucukdeluxe", diff --git a/scripts/dev.mjs b/scripts/dev.mjs index bf1666f..7ec9d87 100644 --- a/scripts/dev.mjs +++ b/scripts/dev.mjs @@ -93,7 +93,7 @@ if (process.platform === 'win32') { sourcePath: electronSourceExecutable, destinationPath: resolve(rootDirectory, 'node_modules', 'electron', 'dist', 'Twitch VOD Manager.exe'), iconPath: resolve(rootDirectory, 'build', 'icon.ico'), - version: '1.0.12', + version: '1.0.13', }); } diff --git a/scripts/smoke-test-ci-contract.js b/scripts/smoke-test-ci-contract.js index 7c42ae8..5e3819a 100644 --- a/scripts/smoke-test-ci-contract.js +++ b/scripts/smoke-test-ci-contract.js @@ -52,7 +52,9 @@ for (const relativePath of ['.github/workflows/windows-ci.yml', '.gitea/workflow for (const command of requiredCommands) { check(source.includes(command), `${relativePath} is missing ${command}`); } - check(source.includes('if ($LASTEXITCODE -ne 0)') && source.match(/npm run pack/g)?.length >= 2, `${relativePath} does not retry transient package failures`); + for (const command of ['npm run pack', 'npm run dist:ci']) { + check(source.match(new RegExp(command.replace(/[:]/g, '\\:'), 'g'))?.length >= 2, `${relativePath} does not retry transient ${command} failures`); + } const runSteps = source.split(/\r?\n/).filter((line) => /^\s+run:\s+/.test(line)); const timeoutSteps = source.split(/\r?\n/).filter((line) => /^\s+timeout-minutes:\s*10\s*$/.test(line)); check(timeoutSteps.length >= runSteps.length, `${relativePath} does not cap every command at ten minutes`); diff --git a/scripts/smoke-test-public-release-config.js b/scripts/smoke-test-public-release-config.js index 5644468..e0c22c7 100644 --- a/scripts/smoke-test-public-release-config.js +++ b/scripts/smoke-test-public-release-config.js @@ -15,9 +15,9 @@ function check(condition, message) { if (!condition) failures.push(message); } -check(packageJson.version === '1.0.12', `package version is ${packageJson.version}`); -check(packageLock.version === '1.0.12', `lockfile version is ${packageLock.version}`); -check(packageLock.packages?.['']?.version === '1.0.12', `lockfile root package version is ${packageLock.packages?.['']?.version}`); +check(packageJson.version === '1.0.13', `package version is ${packageJson.version}`); +check(packageLock.version === '1.0.13', `lockfile version is ${packageLock.version}`); +check(packageLock.packages?.['']?.version === '1.0.13', `lockfile root package version is ${packageLock.packages?.['']?.version}`); check(packageJson.build?.appId === 'io.github.sucukdeluxe.twitch-vod-manager', `appId is ${packageJson.build?.appId}`); check(packageJson.build?.publish?.provider === 'generic', `publish provider is ${packageJson.build?.publish?.provider}`); check(packageJson.build?.publish?.url === 'https://github.com/Sucukdeluxe/Twitch-VOD-Manager/releases/latest/download/', `publish URL is ${packageJson.build?.publish?.url}`); @@ -65,7 +65,7 @@ check(mainSource.includes('GITHUB_RELEASES_DOWNLOAD_BASE_URL'), 'GitHub releases check(mainSource.includes('https://api.github.com/repos/Sucukdeluxe/Twitch-VOD-Manager/releases/latest'), 'GitHub latest release API URL is missing'); check(mainSource.includes('https://github.com/Sucukdeluxe/Twitch-VOD-Manager/releases/download'), 'GitHub release download URL is missing'); check(!/storyboards\/\d{8,12}(?:-|\/)/.test(mainSource), 'numeric Twitch VOD example remains in the public source'); -check(indexSource.includes('Version: v1.0.12'), 'initial version label is not 1.0.12'); +check(indexSource.includes('Version: v1.0.13'), 'initial version label is not 1.0.13'); check(!indexSource.includes('Version: v4.1.13'), 'legacy version label is still present'); check(fs.existsSync(manifestPath), 'public release manifest is missing'); diff --git a/src/index.html b/src/index.html index cb28d4e..a218182 100644 --- a/src/index.html +++ b/src/index.html @@ -940,7 +940,7 @@