Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
adamws committed Nov 24, 2024
1 parent 198235d commit 9a26317
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 34 deletions.
77 changes: 45 additions & 32 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,37 @@ jobs:
name: Run functional tests
needs:
- build-and-test
runs-on: ubuntu-latest
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: klawa-ubuntu-latest
path: zig-out/bin
- name: Install dependencies
- if: matrix.os == 'ubuntu-latest'
name: Install dependencies
shell: bash
run: |
sudo apt-get update
sudo apt-get install ffmpeg xdotool x11-apps xvfb
- if: matrix.os == 'windows-latest'
name: Install dependencies
shell: bash
run: |
choco install autohotkey.portable ffmpeg
- name: Install python dependencies
shell: bash
run: |
cd tests
python -m venv .env
. .env/bin/activate
if [ $RUNNER_OS == "Windows" ]; then
./env/Scripts/activate
else
source .env/bin/activate
fi
pip install -r dev-requirements.txt
- name: Run tests
shell: bash
Expand All @@ -80,36 +93,36 @@ jobs:
- uses: actions/upload-artifact@v4
if: always()
with:
name: report
name: report-${{ matrix.os }}
path: tests/report/
retention-days: 2
if-no-files-found: error

deploy-preview:
name: Deploy tests results
needs:
- run-functional-tests
runs-on: ubuntu-latest
defaults:
run:
shell: bash
working-directory: ./tests
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: report
path: tests/report
- name: Install Vercel CLI
run: npm install --global vercel@latest
- name: Pull Vercel Environment Information
run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
- name: Build Project Artifacts
run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
- name: Deploy Project Artifacts to Vercel
run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} > url.txt
- name: Add summary
shell: bash
run: |
echo '### Deployed' >> $GITHUB_STEP_SUMMARY
cat url.txt >> $GITHUB_STEP_SUMMARY
# deploy-preview:
# name: Deploy tests results
# needs:
# - run-functional-tests
# runs-on: ubuntu-latest
# defaults:
# run:
# shell: bash
# working-directory: ./tests
# steps:
# - uses: actions/checkout@v4
# - uses: actions/download-artifact@v4
# with:
# name: report
# path: tests/report
# - name: Install Vercel CLI
# run: npm install --global vercel@latest
# - name: Pull Vercel Environment Information
# run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
# - name: Build Project Artifacts
# run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
# - name: Deploy Project Artifacts to Vercel
# run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} > url.txt
# - name: Add summary
# shell: bash
# run: |
# echo '### Deployed' >> $GITHUB_STEP_SUMMARY
# cat url.txt >> $GITHUB_STEP_SUMMARY
1 change: 0 additions & 1 deletion src/textures.zig
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ fn getPositions(sizes: []const rl.Vector2) [keycap_sizes.len]rl.Vector2 {
}

pub fn getPositionBySize(size: rl.Vector2) rl.Vector2 {
std.debug.print("Looking for {d} {d}\n", .{size.x, size.y});
for (keycap_sizes, 0..) |s, i| {
if (size.x == s.x and size.y == s.y) {
return atlas_positions[i];
Expand Down
1 change: 0 additions & 1 deletion tests/src/test_rendering.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import logging
import os
from os.path import isfile
import signal
import shutil
import subprocess
Expand Down

0 comments on commit 9a26317

Please sign in to comment.