Skip to content

Commit 10d3a27

Browse files
committed
Standardize workspace: Justfile migration and A2ML directive cleanup
1 parent c0f847c commit 10d3a27

12 files changed

Lines changed: 98 additions & 601 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ jobs:
3434

3535
steps:
3636
- name: Checkout repository
37+
<<<<<<< HEAD
3738
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
39+
=======
40+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
41+
>>>>>>> 547446e (chore: estate-wide chore + stale-path sweep (2026-04-17))
3842

3943
- name: Initialize CodeQL
4044
uses: github/codeql-action/init@a4784f2dad6682d68cce8299ef20b1ca931bbdfb # v4

.github/workflows/generator-generic-ossf-slsa3-publish.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ jobs:
2020
digests: ${{ steps.hash.outputs.digests }}
2121

2222
steps:
23+
<<<<<<< HEAD
2324
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
25+
=======
26+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
27+
>>>>>>> 547446e (chore: estate-wide chore + stale-path sweep (2026-04-17))
2428

2529
- name: Build artifacts
2630
run: |
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Sample workflow for building and deploying a Jekyll site to GitHub Pages
2+
name: Deploy Jekyll with GitHub Pages dependencies preinstalled
3+
4+
on:
5+
# Runs on pushes targeting the default branch
6+
push:
7+
branches: ["main"]
8+
9+
# Allows you to run this workflow manually from the Actions tab
10+
workflow_dispatch:
11+
12+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
13+
permissions:
14+
contents: read
15+
pages: write
16+
id-token: write
17+
18+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
19+
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
20+
concurrency:
21+
group: "pages"
22+
cancel-in-progress: false
23+
24+
jobs:
25+
# Build job
26+
build:
27+
runs-on: ubuntu-latest
28+
steps:
29+
- name: Checkout
30+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
31+
- name: Setup Pages
32+
uses: actions/configure-pages@v5
33+
- name: Build with Jekyll
34+
uses: actions/jekyll-build-pages@v1
35+
with:
36+
source: ./
37+
destination: ./_site
38+
- name: Upload artifact
39+
uses: actions/upload-pages-artifact@v3
40+
41+
# Deployment job
42+
deploy:
43+
environment:
44+
name: github-pages
45+
url: ${{ steps.deployment.outputs.page_url }}
46+
runs-on: ubuntu-latest
47+
needs: build
48+
steps:
49+
- name: Deploy to GitHub Pages
50+
id: deployment
51+
uses: actions/deploy-pages@v4

.github/workflows/php.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ jobs:
1515
build:
1616
runs-on: ubuntu-latest
1717
steps:
18+
<<<<<<< HEAD
1819
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
20+
=======
21+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
22+
>>>>>>> 547446e (chore: estate-wide chore + stale-path sweep (2026-04-17))
1923

2024
- name: Validate composer.json and composer.lock
2125
run: composer validate --strict

.github/workflows/rsr-antipattern.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ jobs:
2020
antipattern-check:
2121
runs-on: ubuntu-latest
2222
steps:
23+
<<<<<<< HEAD
2324
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
25+
=======
26+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
27+
>>>>>>> 547446e (chore: estate-wide chore + stale-path sweep (2026-04-17))
2428

2529
- name: Check for TypeScript
2630
run: |

.github/workflows/rust.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Rust
2+
3+
on:
4+
push:
5+
branches: [ "main" ]
6+
pull_request:
7+
branches: [ "main" ]
8+
9+
env:
10+
CARGO_TERM_COLOR: always
11+
12+
jobs:
13+
build:
14+
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
19+
- name: Build
20+
run: cargo build --verbose
21+
- name: Run tests
22+
run: cargo test --verbose

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,27 @@ htmlcov/
7878
*.tmp
7979
*.bak
8080

81+
<<<<<<< HEAD
8182
# Local deployment runtime data
8283
deploy/wharf-local/
8384

8485
# AI/Sync artifacts
8586
ai-cli-crash-capture/
8687
.directory
8788
sync_report*.txt
89+
=======
90+
# Coverage reports
91+
tarpaulin-report.html
92+
coverage/
93+
>>>>>>> 547446e (chore: estate-wide chore + stale-path sweep (2026-04-17))
8894
target/
8995
node_modules/
9096
_build/
9197
deps/
9298
.elixir_ls/
99+
<<<<<<< HEAD
93100
.cache/
101+
=======
102+
>>>>>>> 547446e (chore: estate-wide chore + stale-path sweep (2026-04-17))
94103
build/
95104
dist/

adapters/drupal/filesystem.ncl

Lines changed: 0 additions & 111 deletions
This file was deleted.

adapters/generic-lamp/filesystem.ncl

Lines changed: 0 additions & 92 deletions
This file was deleted.

0 commit comments

Comments
 (0)