Compare commits
2
Commits
47785cd4b9
..
1.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b0bd517c6 | ||
|
|
babb74c7ad |
@@ -41,10 +41,17 @@ jobs:
|
|||||||
# checks is keyed per-system (checks.<system>.default); nix build's
|
# checks is keyed per-system (checks.<system>.default); nix build's
|
||||||
# #attr shorthand can't resolve it, so resolve the current system inline.
|
# #attr shorthand can't resolve it, so resolve the current system inline.
|
||||||
# --impure lets the flake read APP_VERSION via builtins.getEnv
|
# --impure lets the flake read APP_VERSION via builtins.getEnv
|
||||||
# (pure evals always get the package defaults). The offline test suite
|
# (pure evals always get the package defaults).
|
||||||
# runs in the package's checkPhase.
|
- name: Build package
|
||||||
|
run: |
|
||||||
|
nix build -L ".#packages.$(nix eval --impure --raw --expr 'builtins.currentSystem').default" \
|
||||||
|
--impure --out-link result-pkg
|
||||||
|
# The offline test suite runs in the check derivation's checkPhase.
|
||||||
|
# This is a separate build/output from the package itself.
|
||||||
- name: Build + offline test suite
|
- name: Build + offline test suite
|
||||||
run: nix build -L ".#checks.$(nix eval --impure --raw --expr 'builtins.currentSystem').default" --impure
|
run: |
|
||||||
|
nix build -L ".#checks.$(nix eval --impure --raw --expr 'builtins.currentSystem').default" \
|
||||||
|
--impure --out-link result-checks
|
||||||
|
|
||||||
- name: Live portal tests
|
- name: Live portal tests
|
||||||
env:
|
env:
|
||||||
@@ -59,10 +66,11 @@ jobs:
|
|||||||
./build/test_license_service
|
./build/test_license_service
|
||||||
'
|
'
|
||||||
|
|
||||||
# Release closure lands in the release cache.
|
# Release closure (the actual package, not the check output) lands in the
|
||||||
|
# release cache.
|
||||||
- name: Push to Attic release cache
|
- name: Push to Attic release cache
|
||||||
env:
|
env:
|
||||||
ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN_PROD }}
|
ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN_PROD }}
|
||||||
run: |
|
run: |
|
||||||
attic login radiantwave https://attic.radiantwavetech.com "$ATTIC_TOKEN"
|
attic login radiantwave https://attic.radiantwavetech.com "$ATTIC_TOKEN"
|
||||||
attic push radiantwave:radiantwave ./result
|
attic push radiantwave:radiantwave ./result-pkg
|
||||||
|
|||||||
+2
-2
@@ -281,10 +281,10 @@ void Home::render(SDL_Renderer *renderer)
|
|||||||
fourSpaces.destroy();
|
fourSpaces.destroy();
|
||||||
|
|
||||||
const float margin = 20.0f;
|
const float margin = 20.0f;
|
||||||
float rectRight = fw - margin;
|
float rectRight = fw - margin - 50.0f;
|
||||||
float rectLeft = rectRight - (maxNameW + spaceW4 + maxValueW);
|
float rectLeft = rectRight - (maxNameW + spaceW4 + maxValueW);
|
||||||
|
|
||||||
float lineY = fh - margin;
|
float lineY = fh - margin - 50.0f;
|
||||||
const float lineGap = 6.0f;
|
const float lineGap = 6.0f;
|
||||||
for (size_t i = footerNames_.size(); i-- > 0;)
|
for (size_t i = footerNames_.size(); i-- > 0;)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user