Skip to content

Commit 4b6d7fe

Browse files
chrescobarchrescobar
authored
Merge pull request #88 from CEPI-dxkb/test
test -> main (v0.2.13)
2 parents cc1c62e + 34ee8d7 commit 4b6d7fe

271 files changed

Lines changed: 37111 additions & 3828 deletions

File tree

Some content is hidden

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

‎.eslintrc.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
},
1010
"globals": {
1111
"dojo": true,
12-
"gtag": true,
1312
"d3": true,
1413
"clipboard": true,
1514
"cookie": true,

‎.github/workflows/hotfix-tag.yml‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
name: Tag Hotfix
2+
on:
3+
pull_request:
4+
types: [closed]
5+
branches: [master]
6+
7+
jobs:
8+
tag-hotfix:
9+
# Only run if PR was merged and branch name starts with hotfix/v
10+
if: github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'hotfix/v')
11+
runs-on: ubuntu-latest
12+
permissions:
13+
contents: write
14+
pull-requests: write
15+
steps:
16+
- uses: actions/checkout@v4
17+
with:
18+
ref: master
19+
fetch-depth: 0
20+
21+
- name: Configure Git
22+
run: |
23+
git config user.name "github-actions[bot]"
24+
git config user.email "github-actions[bot]@users.noreply.github.com"
25+
26+
- name: Create and push tag
27+
run: |
28+
# Extract version from branch name (hotfix/vX.X.X -> vX.X.X)
29+
VERSION=$(echo "${{ github.event.pull_request.head.ref }}" | sed 's/hotfix\///')
30+
# Use PR title as tag message
31+
git tag -a "$VERSION" -m "${{ github.event.pull_request.title }}"
32+
git push origin "$VERSION"
33+
echo "Created and pushed tag: $VERSION"
34+
35+
- name: Cherry-pick to alpha
36+
env:
37+
GH_TOKEN: ${{ github.token }}
38+
run: |
39+
# Get the merge commit SHA
40+
MERGE_COMMIT=${{ github.event.pull_request.merge_commit_sha }}
41+
VERSION=$(echo "${{ github.event.pull_request.head.ref }}" | sed 's/hotfix\///')
42+
43+
# Fetch alpha branch
44+
git fetch origin alpha
45+
git checkout alpha
46+
47+
# Create a branch for the cherry-pick
48+
git checkout -b cherry-pick/hotfix-${VERSION}-alpha
49+
50+
# Cherry-pick the commits from the hotfix (excluding merge commit itself)
51+
if git cherry-pick -x $MERGE_COMMIT -m 1; then
52+
echo "Cherry-pick succeeded"
53+
else
54+
echo "Cherry-pick had conflicts. Aborting and creating PR with instructions."
55+
git cherry-pick --abort
56+
fi
57+
58+
# Push the cherry-pick branch
59+
git push -u origin cherry-pick/hotfix-${VERSION}-alpha
60+
61+
# Always create a PR (protected branches require PRs)
62+
gh pr create --base alpha --head cherry-pick/hotfix-${VERSION}-alpha \
63+
--title "Cherry-pick: Hotfix ${VERSION} to alpha" \
64+
--body "## Cherry-pick Hotfix ${VERSION} to alpha
65+
66+
This PR cherry-picks the hotfix from master to alpha.
67+
68+
Original PR: #${{ github.event.pull_request.number }}
69+
Merge commit: ${MERGE_COMMIT}
70+
71+
---
72+
*This PR was created automatically by the hotfix-tag workflow.*"
73+
74+
echo "Created PR for cherry-pick to alpha"
75+
76+
- name: Cherry-pick to beta
77+
env:
78+
GH_TOKEN: ${{ github.token }}
79+
run: |
80+
# Get the merge commit SHA
81+
MERGE_COMMIT=${{ github.event.pull_request.merge_commit_sha }}
82+
VERSION=$(echo "${{ github.event.pull_request.head.ref }}" | sed 's/hotfix\///')
83+
84+
# Fetch beta branch
85+
git fetch origin beta
86+
git checkout beta
87+
88+
# Create a branch for the cherry-pick
89+
git checkout -b cherry-pick/hotfix-${VERSION}-beta
90+
91+
# Cherry-pick the commits from the hotfix
92+
if git cherry-pick -x $MERGE_COMMIT -m 1; then
93+
echo "Cherry-pick succeeded"
94+
else
95+
echo "Cherry-pick had conflicts. Aborting and creating PR with instructions."
96+
git cherry-pick --abort
97+
fi
98+
99+
# Push the cherry-pick branch
100+
git push -u origin cherry-pick/hotfix-${VERSION}-beta
101+
102+
# Always create a PR (protected branches require PRs)
103+
gh pr create --base beta --head cherry-pick/hotfix-${VERSION}-beta \
104+
--title "Cherry-pick: Hotfix ${VERSION} to beta" \
105+
--body "## Cherry-pick Hotfix ${VERSION} to beta
106+
107+
This PR cherry-picks the hotfix from master to beta.
108+
109+
Original PR: #${{ github.event.pull_request.number }}
110+
Merge commit: ${MERGE_COMMIT}
111+
112+
---
113+
*This PR was created automatically by the hotfix-tag workflow.*"
114+
115+
echo "Created PR for cherry-pick to beta"
116+
117+
- name: Delete hotfix branch
118+
env:
119+
GH_TOKEN: ${{ github.token }}
120+
run: |
121+
BRANCH="${{ github.event.pull_request.head.ref }}"
122+
gh api -X DELETE "repos/${{ github.repository }}/git/refs/heads/${BRANCH}" || true
123+
echo "Deleted branch: $BRANCH"

‎.github/workflows/hotfix.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Hotfix
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
hotfix_message:
6+
description: 'Hotfix description (what is being fixed)'
7+
required: true
8+
type: string
9+
10+
jobs:
11+
create-hotfix:
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: write
15+
pull-requests: write
16+
steps:
17+
- uses: actions/checkout@v4
18+
with:
19+
ref: master
20+
fetch-depth: 0
21+
22+
- name: Configure Git
23+
run: |
24+
git config user.name "github-actions[bot]"
25+
git config user.email "github-actions[bot]@users.noreply.github.com"
26+
27+
- name: Bump patch version and create hotfix branch
28+
id: bump
29+
run: |
30+
npm version patch --no-git-tag-version
31+
VERSION=$(node -p "require('./package.json').version")
32+
echo "version=$VERSION" >> $GITHUB_OUTPUT
33+
git checkout -b hotfix/v${VERSION}
34+
git add package.json package-lock.json
35+
git commit -m "Hotfix v${VERSION}
36+
37+
${{ inputs.hotfix_message }}"
38+
39+
- name: Push branch and create PR
40+
env:
41+
GH_TOKEN: ${{ github.token }}
42+
run: |
43+
VERSION=${{ steps.bump.outputs.version }}
44+
# Delete the branch if it already exists (from a failed previous run)
45+
git push origin --delete hotfix/v${VERSION} 2>/dev/null || true
46+
git push -u origin hotfix/v${VERSION}
47+
gh pr create --base master --head hotfix/v${VERSION} \
48+
--title "Hotfix v${VERSION}" \
49+
--body "## Hotfix v${VERSION}
50+
51+
${{ inputs.hotfix_message }}
52+
53+
---
54+
**Next steps:**
55+
1. Check out this branch locally: \`git fetch origin && git checkout hotfix/v${VERSION}\`
56+
2. Make your fix commits
57+
3. Push your changes: \`git push\`
58+
4. Merge this PR when ready
59+
60+
*After merging, a tag will be created and changes will be cherry-picked to alpha.*"

‎.github/workflows/release-tag.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Tag Release
2+
on:
3+
pull_request:
4+
types: [closed]
5+
branches: [alpha]
6+
7+
jobs:
8+
tag-release:
9+
# Only run if PR was merged and branch name starts with release/v
10+
if: github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/v')
11+
runs-on: ubuntu-latest
12+
permissions:
13+
contents: write
14+
steps:
15+
- uses: actions/checkout@v4
16+
with:
17+
ref: alpha
18+
fetch-depth: 0
19+
20+
- name: Configure Git
21+
run: |
22+
git config user.name "github-actions[bot]"
23+
git config user.email "github-actions[bot]@users.noreply.github.com"
24+
25+
- name: Create and push tag
26+
run: |
27+
# Extract version from branch name (release/vX.X.X -> vX.X.X)
28+
VERSION=$(echo "${{ github.event.pull_request.head.ref }}" | sed 's/release\///')
29+
# Use PR title as tag message
30+
git tag -a "$VERSION" -m "${{ github.event.pull_request.title }}"
31+
git push origin "$VERSION"
32+
echo "Created and pushed tag: $VERSION"
33+
34+
- name: Delete release branch
35+
env:
36+
GH_TOKEN: ${{ github.token }}
37+
run: |
38+
BRANCH="${{ github.event.pull_request.head.ref }}"
39+
gh api -X DELETE "repos/${{ github.repository }}/git/refs/heads/${BRANCH}" || true
40+
echo "Deleted branch: $BRANCH"

‎.github/workflows/release.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Release
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
version_type:
6+
description: 'Version bump type'
7+
required: true
8+
type: choice
9+
options:
10+
- patch
11+
- minor
12+
- major
13+
release_message:
14+
description: 'Release message (what changed in this release)'
15+
required: true
16+
type: string
17+
18+
jobs:
19+
bump-version:
20+
runs-on: ubuntu-latest
21+
permissions:
22+
contents: write
23+
pull-requests: write
24+
steps:
25+
- uses: actions/checkout@v4
26+
with:
27+
ref: alpha
28+
29+
- name: Configure Git
30+
run: |
31+
git config user.name "github-actions[bot]"
32+
git config user.email "github-actions[bot]@users.noreply.github.com"
33+
34+
- name: Bump version
35+
id: bump
36+
run: |
37+
npm version ${{ inputs.version_type }} --no-git-tag-version
38+
VERSION=$(node -p "require('./package.json').version")
39+
echo "version=$VERSION" >> $GITHUB_OUTPUT
40+
git checkout -b release/v${VERSION}
41+
git add package.json package-lock.json
42+
git commit -m "Release v${VERSION}
43+
44+
${{ inputs.release_message }}"
45+
46+
- name: Push branch and create PR
47+
env:
48+
GH_TOKEN: ${{ github.token }}
49+
run: |
50+
VERSION=${{ steps.bump.outputs.version }}
51+
git push -u origin release/v${VERSION}
52+
gh pr create --base alpha --head release/v${VERSION} \
53+
--title "Release v${VERSION}" \
54+
--body "## Release v${VERSION}
55+
56+
${{ inputs.release_message }}
57+
58+
---
59+
*After merging, a tag will be created automatically.*"

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,3 +146,5 @@ gulpfile.js
146146
chroma.log
147147
chroma_data/
148148
src/
149+
150+
.claude/settings.local.json

0 commit comments

Comments
 (0)