Skip to content

Commit 78e7300

Browse files
JunirezzJunirezz
committed
Resolve merge conflicts in Navbar and VaultDashboard
2 parents 40b8b37 + 5bf2653 commit 78e7300

55 files changed

Lines changed: 5174 additions & 130 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/backend-governance.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,7 @@ jobs:
4242
echo "❌ openapi.json is out of date. Run 'npm run generate:openapi' locally and commit the changes."
4343
git diff openapi.json
4444
exit 1
45-
fi
45+
fi
46+
47+
- name: Check for database schema drift
48+
run: npm run db:check-drift

‎.github/workflows/cypress.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Cypress Smoke Tests
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- 'frontend/**'
7+
push:
8+
branches:
9+
- main
10+
paths:
11+
- 'frontend/**'
12+
13+
jobs:
14+
cypress-run:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v4
19+
20+
- name: Setup Node
21+
uses: actions/setup-node@v4
22+
with:
23+
node-version: '20'
24+
cache: 'npm'
25+
cache-dependency-path: frontend/package-lock.json
26+
27+
- name: Install dependencies
28+
working-directory: frontend
29+
run: npm ci
30+
31+
- name: Cypress run
32+
uses: cypress-io/github-action@v6
33+
with:
34+
working-directory: frontend
35+
start: npm run dev
36+
wait-on: 'http://localhost:5173'
37+
browser: chrome
38+
spec: cypress/e2e/smoke.cy.ts
39+
env:
40+
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
41+
42+
- name: Upload screenshots on failure
43+
uses: actions/upload-artifact@v4
44+
if: failure()
45+
with:
46+
name: cypress-screenshots
47+
path: frontend/cypress/screenshots

‎.github/workflows/release.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v[0-9]+.[0-9]+.[0-9]+'
7+
8+
permissions:
9+
contents: write
10+
11+
jobs:
12+
release:
13+
name: Generate changelog and publish release
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 0
21+
token: ${{ secrets.GITHUB_TOKEN }}
22+
23+
# Generate the full CHANGELOG.md (all releases, written to file)
24+
- name: Generate full CHANGELOG.md
25+
uses: orhun/git-cliff-action@v4
26+
with:
27+
config: cliff.toml
28+
args: --verbose
29+
env:
30+
OUTPUT: CHANGELOG.md
31+
GITHUB_REPO: ${{ github.repository }}
32+
33+
# Generate release-only notes for the GitHub Release body
34+
- name: Generate release notes for this tag
35+
id: cliff
36+
uses: orhun/git-cliff-action@v4
37+
with:
38+
config: cliff.toml
39+
args: --latest --strip all
40+
env:
41+
OUTPUT: /tmp/release-notes.md
42+
GITHUB_REPO: ${{ github.repository }}
43+
44+
# Commit the updated CHANGELOG.md back to the default branch
45+
- name: Commit CHANGELOG.md
46+
run: |
47+
git config user.name "github-actions[bot]"
48+
git config user.email "github-actions[bot]@users.noreply.github.com"
49+
git add CHANGELOG.md
50+
# Only commit if there are changes
51+
if ! git diff --cached --quiet; then
52+
git commit -m "chore(release): update CHANGELOG.md for ${{ github.ref_name }}"
53+
git push origin HEAD:refs/heads/main
54+
fi
55+
56+
# Create the GitHub Release with the generated notes
57+
- name: Create GitHub Release
58+
uses: softprops/action-gh-release@v2
59+
with:
60+
name: ${{ github.ref_name }}
61+
tag_name: ${{ github.ref_name }}
62+
body_path: /tmp/release-notes.md
63+
draft: false
64+
prerelease: ${{ contains(github.ref_name, '-') }}

‎.github/workflows/rust-wasm.yml‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,40 @@ jobs:
8383
uses: actions/upload-artifact@v4
8484
with:
8585
name: wasm-artifacts
86-
path: artifacts/wasm
86+
path: artifacts/wasm
87+
88+
testnet-deploy:
89+
name: Testnet deploy & smoke test
90+
runs-on: ubuntu-latest
91+
needs: wasm-build
92+
# Only run on push to main — not on pull requests
93+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
94+
steps:
95+
- name: Checkout
96+
uses: actions/checkout@v4
97+
98+
- name: Download WASM artifacts
99+
uses: actions/download-artifact@v4
100+
with:
101+
name: wasm-artifacts
102+
path: artifacts/wasm
103+
104+
- name: Verify vault WASM is present
105+
run: ls -la artifacts/wasm/
106+
107+
- name: Install Stellar CLI
108+
uses: stellar/stellar-cli@v23.0.1
109+
110+
- name: Deploy contract and run smoke test
111+
env:
112+
TESTNET_SECRET_KEY: ${{ secrets.TESTNET_SECRET_KEY }}
113+
TESTNET_TOKEN_ADDRESS: ${{ secrets.TESTNET_TOKEN_ADDRESS }}
114+
GIT_SHA: ${{ github.sha }}
115+
run: bash contracts/vault/scripts/smoke-test.sh
116+
117+
- name: Upload deployment artifact
118+
uses: actions/upload-artifact@v4
119+
with:
120+
name: testnet-deployment
121+
path: deployment.json
122+
retention-days: 7

‎.kiro/specs/redis-rate-limiting/.config.kiro‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"specId": "1e0f4317-5877-48ed-83d6-8c0622026c5f", "workflowType": "requirements-first", "specType": "feature"}

0 commit comments

Comments
 (0)