Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
c5f99b0
Improve build process
JDziurlaj Feb 2, 2026
72742af
Fixed nested bash script syntax issue
JDziurlaj Feb 24, 2026
3eef3b2
Update JetBrains dependency
JDziurlaj Feb 24, 2026
34202a1
Update MacOS builds
JDziurlaj Feb 24, 2026
78f0530
Fix regression
JDziurlaj Feb 24, 2026
e3a4e30
Update Xcode for MAUI builds
JDziurlaj Feb 24, 2026
cf3e7aa
Replace gcc test with clang on WIndows
JDziurlaj Feb 24, 2026
73c69ae
Remove version suffixes from pacman pkgs
JDziurlaj Feb 24, 2026
47db085
Update ElectionPartialKeyBackup.cs
JDziurlaj Feb 24, 2026
e7afaee
Fix MacOS UI Build
JDziurlaj Feb 25, 2026
fd4ad56
Use record type
JDziurlaj Feb 25, 2026
f1bb7e7
Update ElectionPartialKeyBackup.cs
JDziurlaj Feb 24, 2026
ed0a49c
Use record type
JDziurlaj Feb 25, 2026
3d55986
Merge branch 'bug/gc-516' of https://github.com/Election-Tech-Initiat…
JDziurlaj Feb 25, 2026
49cd9b2
Do not build arm64 with maccatalyst
JDziurlaj Feb 25, 2026
e26ff86
Update ElectionPartialKeyBackup.cs
JDziurlaj Feb 24, 2026
0815d63
Use record type
JDziurlaj Feb 25, 2026
aada158
Merge branch 'bug/gc-516' of https://github.com/Election-Tech-Initiat…
JDziurlaj Feb 25, 2026
9a87e3e
Attempt MSYS2 build fix
JDziurlaj Feb 25, 2026
b257df9
Update nvika to NET8.0+ compatible version
JDziurlaj Feb 25, 2026
b14b45f
Update ubuntu image
JDziurlaj Feb 25, 2026
ca169c0
Update outdated node depdency
JDziurlaj Feb 25, 2026
c0c3b45
Update lookup_table.hpp
JDziurlaj Feb 25, 2026
c8bb509
Switch to beta Windows with VS2026
JDziurlaj Feb 25, 2026
1bb063d
Remove x64 from mac build
JDziurlaj Feb 26, 2026
c4c6da2
Remove x64 support for macOS
JDziurlaj Feb 26, 2026
e616444
Update ElectionGuard.UI.csproj
JDziurlaj Feb 26, 2026
09ac03d
Remove trimmer step for macOS
JDziurlaj Feb 26, 2026
a1261bd
Remove mac publish
JDziurlaj Feb 26, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"isRoot": true,
"tools": {
"jetbrains.resharper.globaltools": {
"version": "2022.3.2",
"version": "2025.3.3",
"commands": [
"jb"
]
},
"nvika": {
"version": "3.0.0",
"version": "4.0.0",
"commands": [
"nvika"
]
Expand Down
45 changes: 22 additions & 23 deletions .github/workflows/pull-request-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
jobs:
get_version_code:
name: Get Version Code
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
version: ${{ steps.get_version_code.outputs.version }}
build_number: ${{ steps.get_version_code.outputs.build_number }}
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
source: ${{ steps.filter.outputs.source }}
steps:
# For pull requests it's not necessary to checkout the code
- uses: dorny/paths-filter@v2
- uses: dorny/paths-filter@v3
id: filter
with:
filters: |
Expand All @@ -69,11 +69,11 @@ jobs:
name: ["macOS", "windows-os"]
include:
- name: macOS
os: macOS-13
version: "14.2"
os: macos-26
version: "26.2"
osFolder: "maccatalyst"
- name: windows-os
os: windows-2022
os: windows-2025-vs2026
version: "latest"
osFolder: "windows"

Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
if: (runner.os == 'macOS' && steps.filter.outputs.any == 'true')
run: |
ls -ls /Applications/
ls -ls $ANDROID_SDK_ROOT/ndk
# ANDROID_SDK_ROOT may not be set on all runners
sudo xcode-select -switch /Applications/Xcode_${{ matrix.version }}.app

- name: Configure Environment
Expand All @@ -132,20 +132,19 @@ jobs:
- name: Clean UI
if: (steps.filter.outputs.bindings == 'true' || steps.filter.outputs.source == 'true')
run: make clean-ui

- name: Publish UI
if: (steps.filter.outputs.bindings == 'true' || steps.filter.outputs.source == 'true')
env:
BUILD_NUMBER: ${{ needs.get_version_code.outputs.build_number }}
BUILD_VERSION: "${{needs.get_version_code.outputs.version}}"
APPCENTER_SECRET_MACOS: ${{ secrets.APPCENTER_SECRET_MACOS }}
APPCENTER_SECRET_UWP: ${{ secrets.APPCENTER_SECRET_UWP }}
run: make publish-ui

- name: save build artifacts
if: (steps.filter.outputs.bindings == 'true' || steps.filter.outputs.source == 'true')
uses: actions/upload-artifact@v4
with:
name: electionguard-admin
retention-days: 7
path: ./publish/*
# - name: Publish UI
# if: (steps.filter.outputs.bindings == 'true' || steps.filter.outputs.source == 'true')
# env:
# BUILD_NUMBER: ${{ needs.get_version_code.outputs.build_number }}
# BUILD_VERSION: "${{needs.get_version_code.outputs.version}}"
# APPCENTER_SECRET_MACOS: ${{ secrets.APPCENTER_SECRET_MACOS }}
# APPCENTER_SECRET_UWP: ${{ secrets.APPCENTER_SECRET_UWP }}
# run: make publish-ui
#
# - name: save build artifacts
# if: (steps.filter.outputs.bindings == 'true' || steps.filter.outputs.source == 'true')
# uses: actions/upload-artifact@v4
# with:
# name: electionguard-admin
# retention-days: 7
# path: ./publish/*
77 changes: 42 additions & 35 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
typescript: ${{ steps.filter.outputs.typescript }}
steps:
# For pull requests it's not necessary to checkout the code
- uses: dorny/paths-filter@v2
- uses: dorny/paths-filter@v3
id: filter
with:
filters: |
Expand Down Expand Up @@ -65,91 +65,91 @@ jobs:
matrix:
name:
[
"ubuntu-22.04-clang-14.0.0",
"ubuntu-22.04-emscripten-3.1",
"ubuntu-22.04-gcc-12.1.0",
"macos-13-xcode-14.2",
"macos-13-xcode-14.2-arm64",
"windows-2022-gcc-11",
"windows-2022-msvc-latest-x86",
"windows-2022-msvc-latest-x64",
"ubuntu-22.04-linter",
"ubuntu-24.04-clang-14.0.0",
"ubuntu-24.04-emscripten-3.1",
"ubuntu-24.04-gcc-12.1.0",
"macos-15-intel-xcode-16.4",
"macos-15-xcode-16.4-arm64",
"windows-2025-msys2-clang-14",
"windows-2025-msvc-latest-x86",
"windows-2025-msvc-latest-x64",
"ubuntu-24.04-linter",
]
include:
- name: ubuntu-22.04-clang-14.0.0
os: ubuntu-22.04
- name: ubuntu-24.04-clang-14.0.0
os: ubuntu-24.04
processor: x64
compiler: clang
version: "14"
makeReleaseBuild: false
lint: false
runCsTests: false
runTsTests: false
- name: ubuntu-22.04-emscripten-3.1
os: ubuntu-22.04
- name: ubuntu-24.04-emscripten-3.1
os: ubuntu-24.04
processor: x64
compiler: emscripten
version: "3.1.35"
makeReleaseBuild: true
lint: false
runCsTests: false
runTsTests: true
- name: ubuntu-22.04-gcc-12.1.0
os: ubuntu-22.04
- name: ubuntu-24.04-gcc-12.1.0
os: ubuntu-24.04
processor: x64
compiler: gcc
version: "12"
makeReleaseBuild: false
lint: false
runCsTests: false
runTsTests: false
- name: macOS-13-xcode-14.2
os: macOS-13
- name: macos-15-intel-xcode-16.4
os: macos-15-intel
processor: x64
compiler: xcode
version: "14.2"
version: "16.4"
makeReleaseBuild: false
lint: false
runCsTests: true
runTsTests: false
- name: macOS-13-xcode-14.2-arm64
os: macOS-13
- name: macos-15-xcode-16.4-arm64
os: macos-15
processor: arm64
compiler: xcode
version: "14.2"
version: "16.4"
makeReleaseBuild: false
lint: false
runCsTests: false
runTsTests: false
- name: windows-2022-gcc-11
os: windows-2022
- name: windows-2025-msys2-clang-14
os: windows-2025-vs2026
processor: x64
compiler: gcc
version: "11"
compiler: clang
version: "14"
makeReleaseBuild: false
lint: false
runCsTests: false
runTsTests: false
- name: windows-2022-msvc-latest-x86
os: windows-2022
- name: windows-2025-msvc-latest-x86
os: windows-2025-vs2026
processor: x86
compiler: msvc
version: "latest"
makeReleaseBuild: false
lint: false
runCsTests: false
runTsTests: false
- name: windows-2022-msvc-latest-x64
os: windows-2022
- name: windows-2025-msvc-latest-x64
os: windows-2025-vs2026
processor: x64
compiler: msvc
version: "latest"
makeReleaseBuild: false
lint: false
runCsTests: true
runTsTests: false
- name: ubuntu-22.04-linter
os: ubuntu-22.04
- name: ubuntu-24.04-linter
os: ubuntu-24.04
processor: x64
compiler: clang
version: "14"
Expand Down Expand Up @@ -246,7 +246,7 @@ jobs:
if: (runner.os == 'macOS' && steps.filter.outputs.any == 'true')
run: |
ls -ls /Applications/
ls -ls $ANDROID_SDK_ROOT/ndk
# ANDROID_SDK_ROOT may not be set on all runners
sudo xcode-select -switch /Applications/Xcode_${{ matrix.version }}.app

- name: Update Environment (Windows MSYS2)
Expand All @@ -259,9 +259,9 @@ jobs:
base-devel
mingw-w64-clang-x86_64-gcc
mingw-w64-clang-x86_64-toolchain
mingw-w64-clang-x86_64-clang-14
mingw-w64-clang-x86_64-clang
mingw-w64-clang-x86_64-cmake
mingw-w64-clang-x86_64-llvm-14
mingw-w64-clang-x86_64-llvm
make
git

Expand Down Expand Up @@ -320,6 +320,13 @@ jobs:
if: (runner.os == 'Windows' && matrix.compiler == 'msvc' && steps.filter.outputs.cpp == 'true')
run: make test

- name: Run Tests (Windows MSYS2)
env:
PROCESSOR: ${{ matrix.processor }}
if: (runner.os == 'Windows' && matrix.compiler == 'clang' && steps.filter.outputs.cpp == 'true')
shell: msys2 {0}
run: make test-msys2

- name: Run Tests (Windows-x86)
env:
PROCESSOR: ${{ matrix.processor }}
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
jobs:
get_version_code:
name: Get Version Code
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
version: ${{ steps.get_version_code.outputs.version }}
build_number: ${{ steps.get_version_code.outputs.build_number }}
Expand All @@ -32,7 +32,7 @@ jobs:

linux_build_x64:
name: Linux Build (x64)
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
compiler: clang
compiler_version: 14
Expand All @@ -59,9 +59,9 @@ jobs:

maccatalyst_build_arm64:
name: MacCatalyst Build (arm64)
runs-on: macos-13
runs-on: macos-15
env:
compiler_version: 14.2
compiler_version: 16.4
steps:
- name: Checkout Code
uses: actions/checkout@v4
Expand All @@ -82,9 +82,9 @@ jobs:

macos_build_arm64:
name: MacOS Build (arm64)
runs-on: macos-13
runs-on: macos-15
env:
compiler_version: 14.2
compiler_version: 16.4
steps:
- name: Checkout Code
uses: actions/checkout@v4
Expand All @@ -105,9 +105,9 @@ jobs:

macos_build_x64:
name: MacOS Build (x64)
runs-on: macos-13
runs-on: macos-15-intel
env:
compiler_version: 14.2
compiler_version: 16.4
steps:
- name: Checkout Code
uses: actions/checkout@v4
Expand All @@ -128,7 +128,7 @@ jobs:

wasm_build:
name: WASM Build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
compiler: clang
compiler_version: 14
Expand All @@ -154,7 +154,7 @@ jobs:

windows_build_x86:
name: Windows Build (x86)
runs-on: windows-2022
runs-on: windows-2025-vs2026
steps:
- name: Checkout Code
uses: actions/checkout@v4
Expand All @@ -180,7 +180,7 @@ jobs:

windows_build_x64:
name: Windows Build (x64)
runs-on: windows-2022
runs-on: windows-2025-vs2026
steps:
- name: Checkout Code
uses: actions/checkout@v4
Expand Down Expand Up @@ -216,7 +216,7 @@ jobs:
windows_build_x64,
windows_build_x86,
]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Code
uses: actions/checkout@v4
Expand Down Expand Up @@ -275,7 +275,7 @@ jobs:
publish_npm:
name: Publish NPM
needs: [get_version_code, wasm_build]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Code
uses: actions/checkout@v4
Expand Down Expand Up @@ -313,11 +313,11 @@ jobs:
name: ["windows-os"]
include:
# - name: macOS
# os: macOS-13
# version: "14.2"
# os: macos-26
# version: "26.2"
# osFolder: "maccatalyst"
- name: windows-os
os: windows-2022
os: windows-2025-vs2026
version: "latest"
osFolder: "windows"

Expand Down Expand Up @@ -382,10 +382,10 @@ jobs:
publish_release:
name: Publish Release
needs: [get_version_code, publish_nuget, publish_npm, publish_admin]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Create Github Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
name: Release ${{needs.get_version_code.outputs.version}}
tag_name: ${{needs.get_version_code.outputs.version}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sanitizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env:

jobs:
Test:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Fail if non Linux OS
Expand Down
Loading
Loading