mirror of
https://github.com/rizonesoft/Notepad3.git
synced 2026-06-14 21:09:05 +08:00
Merge pull request #5553 from RaiKoHoff/Dev_Master
fix: remove obsolete AppVeyor CI build
This commit is contained in:
Rainer Kottenhoff
GitHub
commit
bd0c3636fc
2
.github/copilot-instructions.md
vendored
2
.github/copilot-instructions.md
vendored
@ -34,7 +34,7 @@ Run `Version.ps1` before building to generate `src\VersionEx.h` from templates i
|
||||
|
||||
### Tests
|
||||
|
||||
Tests live in `test\` and run via AppVeyor CI:
|
||||
Tests live in `test\` and run via GitHub Actions CI (Win32 and x64 jobs):
|
||||
|
||||
```cmd
|
||||
cd test
|
||||
|
||||
15
.github/workflows/build.yml
vendored
15
.github/workflows/build.yml
vendored
@ -83,6 +83,9 @@ jobs:
|
||||
$content = $content -replace '\$VERSION\$', "$Major.$Minor.$Revis.$Build"
|
||||
Set-Content -Path $ConfManifest -Value $content -NoNewline
|
||||
|
||||
# Persist build number for TestFileVersion.cmd
|
||||
$Build | Set-Content -Path "Versions\build.txt" -NoNewline
|
||||
|
||||
Write-Host "Version: $Major.$Minor.$Revis.$Build ($CommitID)"
|
||||
|
||||
- name: Build
|
||||
@ -99,6 +102,18 @@ jobs:
|
||||
|
||||
msbuild Notepad3.sln /m /p:Configuration=$config /p:Platform=$platform /v:minimal
|
||||
|
||||
- name: Install AutoHotkey
|
||||
if: matrix.platform == 'Win32' || matrix.platform == 'x64'
|
||||
run: choco install autohotkey.install --no-progress -y
|
||||
|
||||
- name: Run tests
|
||||
if: matrix.platform == 'Win32' || matrix.platform == 'x64'
|
||||
shell: cmd
|
||||
working-directory: test
|
||||
run: |
|
||||
call TestFileVersion.cmd
|
||||
call TestAhkNotepad3.cmd
|
||||
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
|
||||
[](https://opensource.org/licenses/BSD-3-Clause)
|
||||
[](https://github.com/rizonesoft/Notepad3/actions/workflows/build.yml)
|
||||
[](https://ci.appveyor.com/project/rizonesoft/notepad3/branch/master)
|
||||
[](https://rizonesoft.com/downloads/notepad3/)
|
||||
[](https://github.com/rizonesoft/Notepad3/releases)
|
||||
|
||||
|
||||
51
Version.ps1
51
Version.ps1
@ -4,7 +4,6 @@
|
||||
# - adapt $Build number in case of local machine builds
|
||||
# ------------------------------------------------------------
|
||||
param(
|
||||
[switch]$AppVeyorEnv = $false,
|
||||
[string]$VerPatch = ""
|
||||
)
|
||||
# ------------------------------------------------------------
|
||||
@ -52,35 +51,24 @@ try
|
||||
$LastBuildDay = [string](Get-Content $DayPath)
|
||||
if (!$LastBuildDay) { $LastBuildDay = 0 }
|
||||
|
||||
$AppVeyorBuild = [int]($env:appveyor_build_number) # AppVeyor internal
|
||||
|
||||
if ($AppVeyorEnv) {
|
||||
if ($LastBuildDay -ne "$Revis") {
|
||||
$Revis | Set-Content -Path $DayPath
|
||||
$Build = 1 # reset (AppVeyor)
|
||||
}
|
||||
$CommitID = ([string]($env:appveyor_repo_commit)).substring(0,8)
|
||||
if ($LastBuildDay -ne "$Revis") {
|
||||
$Revis | Set-Content -Path $DayPath
|
||||
$Build = 0 # reset (local build)
|
||||
}
|
||||
else {
|
||||
if ($LastBuildDay -ne "$Revis") {
|
||||
$Revis | Set-Content -Path $DayPath
|
||||
$Build = 0 # reset (local build)
|
||||
}
|
||||
# locally: increase build number and persit it
|
||||
$Build = $Build + 1
|
||||
# locally: read commit ID from .git\refs\heads\<first file>
|
||||
$HeadDir = ".git\refs\heads"
|
||||
$HeadMaster = Get-ChildItem -Path $HeadDir -Force -Recurse -File | Select-Object -First 1
|
||||
$CommitID = [string](Get-Content "$HeadDir\$HeadMaster" -TotalCount 8)
|
||||
if (!$CommitID) {
|
||||
$length = ([string]($env:computername)).length
|
||||
$CommitID = ([string]($env:computername)).substring(0,[math]::min($length,8)).ToLower()
|
||||
}
|
||||
$CommitID = $CommitID -replace '"', ''
|
||||
$CommitID = $CommitID -replace "'", ''
|
||||
$length = $CommitID.length
|
||||
$CommitID = $CommitID.substring(0,[math]::min($length,8))
|
||||
# locally: increase build number and persist it
|
||||
$Build = $Build + 1
|
||||
# locally: read commit ID from .git\refs\heads\<first file>
|
||||
$HeadDir = ".git\refs\heads"
|
||||
$HeadMaster = Get-ChildItem -Path $HeadDir -Force -Recurse -File | Select-Object -First 1
|
||||
$CommitID = [string](Get-Content "$HeadDir\$HeadMaster" -TotalCount 8)
|
||||
if (!$CommitID) {
|
||||
$length = ([string]($env:computername)).length
|
||||
$CommitID = ([string]($env:computername)).substring(0,[math]::min($length,8)).ToLower()
|
||||
}
|
||||
$CommitID = $CommitID -replace '"', ''
|
||||
$CommitID = $CommitID -replace "'", ''
|
||||
$length = $CommitID.length
|
||||
$CommitID = $CommitID.substring(0,[math]::min($length,8))
|
||||
if (!$CommitID) { $CommitID = "---" }
|
||||
$Build | Set-Content -Path $BuildPath
|
||||
|
||||
@ -88,13 +76,6 @@ try
|
||||
DebugOutput("Notepad3 version number: 'v$CompleteVer $VerPatch'")
|
||||
DebugOutput("Notepad3 commit ID: '$CommitID'")
|
||||
|
||||
if ($AppVeyorEnv) {
|
||||
# AppVeyor needs unique artefact build number
|
||||
$AppVeyorVer = "0.0.0.$AppVeyorBuild"
|
||||
DebugOutput("AppVeyor version number: 'v$AppVeyorVer $VerPatch'")
|
||||
Update-AppveyorBuild -Version $AppVeyorVer
|
||||
}
|
||||
|
||||
$SciVer = [string](Get-Content "scintilla\version.txt")
|
||||
if (!$SciVer) { $SciVer = 0 }
|
||||
$LxiVer = [string](Get-Content "lexilla\version.txt")
|
||||
|
||||
226
appveyor.yml
226
appveyor.yml
@ -1,226 +0,0 @@
|
||||
# Notes:
|
||||
# - Minimal appveyor.yml file is an empty file. All sections are optional.
|
||||
# - Indent each level of configuration with 2 spaces. Do not use tabs!
|
||||
# - All section names are case-sensitive.
|
||||
# - Section names should be unique on each level.
|
||||
|
||||
#---------------------------------#
|
||||
# general configuration #
|
||||
#---------------------------------#
|
||||
|
||||
# version format
|
||||
version: 0.0.0.{build}
|
||||
|
||||
# you can use {branch} name in version format too
|
||||
# version: 1.0.{build}-{branch}
|
||||
|
||||
# branches to build
|
||||
branches:
|
||||
# whitelist
|
||||
only:
|
||||
- master
|
||||
|
||||
# blacklist
|
||||
except:
|
||||
- gh-pages
|
||||
|
||||
# Do not build on tags (GitHub only)
|
||||
skip_tags: true
|
||||
|
||||
# Do not build feature branch with open Pull Requests
|
||||
# skip_branch_with_pr: true
|
||||
|
||||
# Maximum number of concurrent jobs for the project
|
||||
max_jobs: 2
|
||||
|
||||
|
||||
#---------------------------------#
|
||||
# environment configuration #
|
||||
#---------------------------------#
|
||||
|
||||
# Operating system (build VM template)
|
||||
#os: Windows Server 2012
|
||||
os: Windows Server 2019
|
||||
|
||||
image:
|
||||
- Visual Studio 2022
|
||||
# - Visual Studio 2019
|
||||
# - Visual Studio 2019 Preview
|
||||
# - Visual Studio 2017
|
||||
# - Visual Studio 2015
|
||||
|
||||
# build Configuration, i.e. Debug, Release, etc.
|
||||
#configuration: Release
|
||||
|
||||
# scripts that are called at very beginning, before repo cloning
|
||||
init:
|
||||
- git config --global core.autocrlf input
|
||||
|
||||
# clone directory
|
||||
clone_folder: c:\projects\notepad3
|
||||
|
||||
# fetch repository as zip archive
|
||||
#shallow_clone: true # default is "false"
|
||||
|
||||
# set clone depth
|
||||
#clone_depth: 5 # clone entire repository history if not defined
|
||||
|
||||
# environment variables
|
||||
#environment:
|
||||
# my_var1: value1
|
||||
# my_var2: value2
|
||||
# this is how to set encrypted variable. Go to "Encrypt data" page in account menu to encrypt data.
|
||||
# my_secure_var1:
|
||||
# secure: FW3tJ3fMncxvs58/ifSP7w==
|
||||
|
||||
# this is how to allow failing jobs in the matrix
|
||||
matrix:
|
||||
fast_finish: true # set this flag to immediately finish build once one of the jobs fails.
|
||||
# allow_failures:
|
||||
# - platform: x86
|
||||
# configuration: Debug
|
||||
# - platform: x64
|
||||
# configuration: Release
|
||||
|
||||
# scripts that run after cloning repository
|
||||
install:
|
||||
- choco install autohotkey.install
|
||||
# - ps: Update-AppveyorBuild -Version "2.$(Get-Date -format yy.Md).$env:appveyor_build_number"
|
||||
- ps: '& "$env:appveyor_build_folder\Version.ps1" -AppVeyorEnv'
|
||||
# - ps: |
|
||||
# if ($true)
|
||||
# {
|
||||
# $Major = 2
|
||||
# $Minor = $(Get-Date -format yy)
|
||||
# $Revis = $(Get-Date -format Mdd)
|
||||
# $Build = $env:appveyor_build_number
|
||||
# if (!$Build) { $Build = 0 }
|
||||
# $SciVer = Get-Content "scintilla\version.txt"
|
||||
# if (!$SciVer) { $SciVer = 0 }
|
||||
# $CompleteVer = "$Major.$Minor.$Revis.$Build"
|
||||
# Copy-Item -LiteralPath "Versions\VersionEx.h.tpl" -Destination "src\VersionEx.h" -Force
|
||||
# (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MAJOR\$', "$Major" } | Set-Content "src\VersionEx.h"
|
||||
# (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MINOR\$', "$Minor" } | Set-Content "src\VersionEx.h"
|
||||
# (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MAINT\$', "$Revis" } | Set-Content "src\VersionEx.h"
|
||||
# (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$BUILD\$', "$Build" } | Set-Content "src\VersionEx.h"
|
||||
# (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$SCIVER\$', "$SciVer" } | Set-Content "src\VersionEx.h"
|
||||
# Copy-Item -LiteralPath "Versions\Notepad3.exe.manifest.tpl" -Destination "res\Notepad3.exe.manifest.conf" -Force
|
||||
# (Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$VERSION\$', $CompleteVer } | Set-Content "res\Notepad3.exe.manifest.conf"
|
||||
# Update-AppveyorBuild -Version $CompleteVer
|
||||
# }
|
||||
|
||||
# enable patching of AssemblyInfo.* files
|
||||
assembly_info:
|
||||
patch: true
|
||||
#file: '**\AssemblyInfo.*'
|
||||
file: 'Versions\AssemblyInfo.inf'
|
||||
assembly_version: '{version}'
|
||||
assembly_file_version: '{version}'
|
||||
assembly_informational_version: '{version}'
|
||||
|
||||
|
||||
#---------------------------------#
|
||||
# build configuration #
|
||||
#---------------------------------#
|
||||
|
||||
# build platform, i.e. x86, x64, Any CPU. This setting is optional.
|
||||
#platform: Any CPU
|
||||
# to add several platforms to build matrix:
|
||||
platform:
|
||||
- Win32
|
||||
- x64
|
||||
|
||||
# to add several configurations to build matrix:
|
||||
configuration:
|
||||
- Release
|
||||
# - Debug
|
||||
|
||||
cache:
|
||||
- packages -> **\packages.config
|
||||
|
||||
build:
|
||||
parallel: true
|
||||
project: Notepad3.sln
|
||||
# MSBuild verbosity level (quiet|minimal|normal|detailed)
|
||||
verbosity: minimal
|
||||
|
||||
# scripts to run before build
|
||||
before_build:
|
||||
- nuget restore -verbosity detailed
|
||||
|
||||
# scripts to run *after* solution is built and *before* automatic packaging occurs (web apps, NuGet packages, Azure Cloud Services)
|
||||
before_package:
|
||||
|
||||
# scripts to run after build
|
||||
after_build:
|
||||
# - 7z a Notepad3_%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Output\%CONFIGURATION%\Notepad3.exe
|
||||
# - appveyor PushArtifact Notepad3_%APPVEYOR_BUILD_VERSION%.zip
|
||||
|
||||
# to run your custom scripts instead of automatic MSBuild
|
||||
build_script:
|
||||
|
||||
# to disable automatic builds
|
||||
#build: off
|
||||
|
||||
#---------------------------------#
|
||||
# tests configuration #
|
||||
#---------------------------------#
|
||||
|
||||
test: off
|
||||
# assemblies:
|
||||
# only:
|
||||
# - asm1.dll
|
||||
# - asm2.dll
|
||||
|
||||
# categories:
|
||||
# only:
|
||||
# - UI
|
||||
# - E2E
|
||||
|
||||
# to disable automatic tests
|
||||
#test: off
|
||||
|
||||
# scripts to run before tests
|
||||
before_test:
|
||||
- cmd: cd test
|
||||
# - echo script1
|
||||
# - ps: Write-Host "script1"
|
||||
|
||||
# to run your custom scripts instead of automatic tests
|
||||
test_script:
|
||||
- TestFileVersion.cmd
|
||||
- TestAhkNotepad3.cmd
|
||||
|
||||
# scripts to run after tests
|
||||
after_test:
|
||||
# - echo after_test
|
||||
|
||||
#---------------------------------#
|
||||
# artifacts configuration #
|
||||
#---------------------------------#
|
||||
|
||||
|
||||
# Artifact paths are relative to C:\projects\notepad3\
|
||||
artifacts:
|
||||
- path: bin\**\*.exe
|
||||
# - name: All
|
||||
|
||||
#deploy:
|
||||
# - provider: S3
|
||||
# access_key_id: XXXXXXXXXXXXXXXXXXXX
|
||||
# secret_access_key:
|
||||
# secure: ---------------------------------------------------------
|
||||
# region: us-west-2
|
||||
# bucket: notepad3
|
||||
# artifact: All
|
||||
# set_public: true
|
||||
# encrypt: true
|
||||
#notifications:
|
||||
#- provider: Email
|
||||
# to:
|
||||
# - rizonesoft+github@gmail.com
|
||||
# on_build_success: true
|
||||
# on_build_failure: true
|
||||
# on_build_status_changed: true
|
||||
|
||||
|
||||
@ -6,8 +6,8 @@ setlocal EnableExtensions EnableDelayedExpansion
|
||||
set _SCRIPTDIR_=%~dp0
|
||||
pushd %_SCRIPTDIR_%
|
||||
|
||||
call :RESOLVE_PATH _EXE_PATH_ "..\..\Bin\Debug_x64_v145\Notepad3.exe"
|
||||
::call :RESOLVE_PATH _EXE_PATH_ "..\..\Bin\Release_x64_v145\Notepad3.exe"
|
||||
::call :RESOLVE_PATH _EXE_PATH_ "..\..\Bin\Debug_x64_v145\Notepad3.exe"
|
||||
call :RESOLVE_PATH _EXE_PATH_ "..\..\Bin\Release_x64_v145\Notepad3.exe"
|
||||
|
||||
call :RESOLVE_PATH _LOG_FILE_ ".\log.txt"
|
||||
|
||||
@ -15,12 +15,12 @@ rem - create new/overwrite logfile
|
||||
echo. New Log Line 1 > "%_LOG_FILE_%"
|
||||
|
||||
rem - start Notepad3
|
||||
::start "NP3" /D "%_SCRIPTDIR_%" /B /I "%_EXE_PATH_%" /l "%_LOG_FILE_%"
|
||||
start "NP3" /D "%_SCRIPTDIR_%" /B /I "%_EXE_PATH_%" /l "%_LOG_FILE_%"
|
||||
|
||||
rem - append to logfile
|
||||
for /L %%a in (2,1,60) do (
|
||||
for /L %%a in (2,1,1000) do (
|
||||
echo. New Log Line %%a >> "%_LOG_FILE_%"
|
||||
call :WAITFOR 250
|
||||
call :WAITFOR 100
|
||||
)
|
||||
|
||||
|
||||
|
||||
@ -108,7 +108,7 @@
|
||||
## GitHub Actions
|
||||
|
||||
- [x] **CI Workflow** - ✅ Added MSVC builds (Win32/x64 Release)
|
||||
- Runs on push/PR to master alongside AppVeyor
|
||||
- Runs on push/PR to master
|
||||
- [x] **ARM64 Build** - ✅ Added to CI matrix (Win32/x64/ARM64)
|
||||
- [ ] **(Q1) Clang-cl Build** - Alternative compiler for better warnings
|
||||
- [ ] **(Q1) Debug Build** - Catch debug-only assertions
|
||||
|
||||
Loading…
Reference in New Issue
Block a user