Skip to content

bring CI builds up to date #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ouwou merged 8 commits into from
May 20, 2025
Merged

bring CI builds up to date #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c1fc6b3
update actions stuff
ouwou May 5, 2025
d500b0c
meow
ouwou May 5, 2025
2e9634c
nyan
ouwou May 5, 2025
933bbef
update keychain submodule
ouwou May 5, 2025
b476852
uwu
ouwou May 5, 2025
e713ea6
nyan nyan
ouwou May 20, 2025
a9f20ad
purr
ouwou May 20, 2025
8851043
meowwwwww!!!
ouwou May 20, 2025
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
25 changes: 11 additions & 14 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:
submodules: true

- name: Fetch CMake
uses: lukka/get-cmake@v3.21.2
uses: lukka/get-cmake@latest

- name: Fetch dependencies
run: |
Expand All @@ -153,16 +153,15 @@ jobs:
brew install libhandy

- name: Build
uses: lukka/run-cmake@v3
with:
buildDirectory: ${{ runner.workspace }}/build
cmakeBuildType: ${{ matrix.buildtype }}
run: |
cmake -Bbuild -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }}
cmake --build build

- name: Setup artifact files
run: |
artifact_dir=build/artifactdir/abaddon-${{ matrix.buildtype }}-${GITHUB_SHA::7}
mkdir -p "${artifact_dir}"
cp "${{runner.workspace}}/build/abaddon" "${artifact_dir}/abaddon"
cp "${{ github.workspace }}/build/abaddon" "${artifact_dir}/abaddon"
cp -r "${{ github.workspace }}/res/css" "${artifact_dir}/css"
cp -r "${{ github.workspace }}/res/res" "${artifact_dir}/res"

Expand All @@ -184,7 +183,7 @@ jobs:
submodules: true

- name: Fetch CMake
uses: lukka/get-cmake@v3.21.2
uses: lukka/get-cmake@latest

- name: Fetch dependencies
run: |
Expand All @@ -193,7 +192,7 @@ jobs:
cd deps
git clone https://github.com/nlohmann/json
cd json
git checkout bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d
git checkout 55f93686c01528224f448c19128836e7df245f72
mkdir build
cd build
cmake ..
Expand All @@ -207,20 +206,18 @@ jobs:
sudo apt-get install libhandy-1-dev

- name: Build
uses: lukka/run-cmake@v3
env:
CC: gcc-9
CXX: g++-9
with:
cmakeAppendedArgs: -DCMAKE_C_COMPILER=gcc-9 -DCMAKE_CXX_COMPILER=g++-9
buildDirectory: ${{ runner.workspace }}/build
cmakeBuildType: ${{ matrix.buildtype }}
run: |
cmake -Bbuild -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }}
cmake --build build

- name: Setup artifact files
run: |
artifact_dir=${{ runner.workspace }}/artifactdir/abaddon-${{ matrix.buildtype }}-${GITHUB_SHA::7}
mkdir -p "${artifact_dir}"
cp "${{runner.workspace}}/build/abaddon" "${artifact_dir}/abaddon"
cp "${{ github.workspace }}/build/abaddon" "${artifact_dir}/abaddon"
cp -r "${{ github.workspace }}/res/css" "${artifact_dir}/css"
cp -r "${{ github.workspace }}/res/res" "${artifact_dir}/res"

Expand Down
2 changes: 1 addition & 1 deletion subprojects/keychain
Open in desktop
Submodule keychain updated 10 files
+17 −0 .github/workflows/check-format.yml
+55 −25 .github/workflows/ci.yml
+0 −48 .github/workflows/codeql-analysis.yml
+4 −40 .gitignore
+0 −6 CMakeLists.txt
+4 −3 README.md
+4 −0 codecov.yml
+1 −1 include/keychain/keychain.h
+129 −86 src/keychain_mac.cpp
+17 −11 test/catch.hpp
Loading