Skip to content

Commit cad0704

Browse files
authored
Merge pull request #7993 from KBVE/dev
Release: 2 features, 4 fixes, 2 chores → Main
2 parents 87addf4 + 06f706e commit cad0704

File tree

38 files changed

+13946
-20512
lines changed

38 files changed

+13946
-20512
lines changed

.github/workflows/ci-monday-e2e.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
- name: Build e2e matrix
5757
id: matrix
5858
run: |
59-
# Get all projects with an e2e target
60-
PROJECTS=$(pnpm nx show projects --with-target e2e 2>/dev/null | sort)
59+
# Get all projects with an e2e target, excluding desktop-only apps
60+
PROJECTS=$(pnpm nx show projects --with-target e2e 2>/dev/null | grep -v '^q$' | sort)
6161
6262
if [ -z "$PROJECTS" ]; then
6363
echo "No e2e projects found"

.github/workflows/ci-weekly-nx-report.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ jobs:
114114
id: nx-report
115115
run: |
116116
set -euo pipefail
117-
pnpm nx report > /tmp/nx-report-raw.txt 2>&1 || true
117+
# Capture report and strip ANSI color/bold codes that nx emits
118+
pnpm nx report 2>&1 | sed 's/\x1b\[[0-9;]*m//g' > /tmp/nx-report-raw.txt || true
118119
echo "report_date=$(date -u +%Y-%m-%d)" >> "$GITHUB_OUTPUT"
119120
echo "report_timestamp=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> "$GITHUB_OUTPUT"
120121
@@ -275,6 +276,22 @@ jobs:
275276
echo "pushed=true" >> "$GITHUB_OUTPUT"
276277
echo "branch_name=$BRANCH_NAME" >> "$GITHUB_OUTPUT"
277278
279+
- name: Install GitHub CLI
280+
if: steps.commit.outputs.pushed == 'true'
281+
run: |
282+
set -euo pipefail
283+
if command -v gh &>/dev/null; then
284+
echo "gh already installed: $(gh --version | head -1)"
285+
else
286+
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
287+
| sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
288+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" \
289+
| sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
290+
sudo apt-get update -qq
291+
sudo apt-get install -y -qq gh
292+
echo "gh installed: $(gh --version | head -1)"
293+
fi
294+
278295
- name: Create PR
279296
if: steps.commit.outputs.pushed == 'true'
280297
env:

.github/workflows/docker-test-app.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,19 @@ jobs:
100100
- name: Install pnpm Dependencies
101101
run: pnpm install
102102

103+
- name: Setup Python + uv
104+
uses: astral-sh/setup-uv@v7
105+
with:
106+
enable-cache: false
107+
103108
- name: Install Playwright Browsers
104109
if: ${{ inputs.install_playwright }}
105110
run: pnpm exec playwright install --with-deps chromium
106111

107112
- name: Nx e2e ${{ inputs.project }}
108113
env:
109114
BUILDKIT_PROGRESS: plain
115+
INPUT_GITHUB_TOKEN: ${{ github.token }}
110116
run: pnpm nx e2e ${{ inputs.project }} --configuration=ci --no-cloud --output-style=stream
111117

112118
- name: Mark test passed

Cargo.lock

Lines changed: 23 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ members = [
2121
'packages/rust/bevy/bevy_player',
2222
'packages/rust/bevy/bevy_cam',
2323
'packages/rust/bevy/bevy_kbve_net',
24+
'packages/rust/bevy/bevy_items',
25+
'packages/rust/bevy/bevy_npc',
2426
]
2527

2628
[profile.dev]

apps/cryptothrone/axum-cryptothrone/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ COPY packages/npm/astro/ packages/npm/astro/
3030
COPY packages/npm/droid/ packages/npm/droid/
3131
COPY packages/npm/laser/ packages/npm/laser/
3232

33+
# Copy generated schemas (content collections may import these)
34+
COPY packages/data/codegen/generated/ packages/data/codegen/generated/
35+
3336
# Copy astro-cryptothrone source
3437
COPY apps/cryptothrone/astro-cryptothrone/ apps/cryptothrone/astro-cryptothrone/
3538

apps/discordsh/axum-discordsh/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ RUN pnpm install --frozen-lockfile
2929
COPY packages/npm/astro/ packages/npm/astro/
3030
COPY packages/npm/droid/ packages/npm/droid/
3131

32+
# Copy generated schemas (content collections may import these)
33+
COPY packages/data/codegen/generated/ packages/data/codegen/generated/
34+
3235
# Copy astro-discordsh source
3336
COPY apps/discordsh/astro-discordsh/ apps/discordsh/astro-discordsh/
3437

apps/herbmail/axum-herbmail/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ RUN pnpm install --frozen-lockfile
2121
COPY packages/npm/astro/ packages/npm/astro/
2222
COPY packages/npm/droid/ packages/npm/droid/
2323

24+
# Copy generated schemas (content collections may import these)
25+
COPY packages/data/codegen/generated/ packages/data/codegen/generated/
26+
2427
# Copy astro-herbmail source
2528
COPY apps/herbmail/astro-herbmail/ apps/herbmail/astro-herbmail/
2629

apps/irc/irc-gateway/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ RUN pnpm install --frozen-lockfile
2121
COPY packages/npm/astro/ packages/npm/astro/
2222
COPY packages/npm/droid/ packages/npm/droid/
2323

24+
# Copy generated schemas (content collections may import these)
25+
COPY packages/data/codegen/generated/ packages/data/codegen/generated/
26+
2427
# Copy astro-irc source
2528
COPY apps/irc/astro-irc/ apps/irc/astro-irc/
2629

apps/kbve/astro-kbve-e2e/e2e/content.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { test, expect } from '@playwright/test';
33
test.describe('content rendering', () => {
44
test('guide page renders markdown content', async ({ page }) => {
55
await page.goto('/guides/getting-started/');
6-
const heading = page.locator('h1');
6+
const heading = page.locator('h1').first();
77
await expect(heading).toBeVisible();
88
await expect(heading).toContainText('Getting Started');
99
});

0 commit comments

Comments
 (0)