Skip to content

Commit 324d343

Browse files
JoshuaSBrownJoshuaSBrown
authored
[Release] - v3.14.01, v2025.10.7.14.01
* [DAPS-1625] - user id map for session key by @JoshuaSBrown, @AronPerez in #1647
1 parent cbe08c2 commit 324d343

File tree

14 files changed

+195
-246
lines changed

14 files changed

+195
-246
lines changed

‎.github/workflows/javascript-format.yml‎

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,48 @@ jobs:
88
# Step 1: Checkout the repository
99
- name: Checkout Code
1010
uses: actions/checkout@v4
11+
with:
12+
token: ${{ secrets.GITHUB_TOKEN }}
13+
ref: ${{ github.head_ref || github.ref }}
1114

1215
# Step 2: Set up Node.js environment
1316
- name: Set up Node.js
1417
uses: actions/setup-node@v4
1518
with:
16-
node-version: "18" # Specify your Node.js version
19+
node-version: "18"
1720

18-
# Step 3: Install Prettier and ESLint globally
21+
# Step 3: Install Prettier
1922
- name: Install Prettier
20-
run: |
21-
npm install -g prettier
23+
run: npm install -g prettier
2224

2325
# Step 4: Run Prettier to format code
24-
- name: Run prettier
26+
- name: Format JavaScript files
2527
run: |
28+
echo "Auto-formatting JavaScript files..."
2629
prettier "**/*.js" --write
27-
git diff
28-
git reset --hard
29-
prettier --check "**/*.js"
30+
echo "Formatting complete"
31+
32+
# Step 5: Check for changes and commit if needed
33+
- name: Commit changes
34+
run: |
35+
# Get the original commit author info
36+
AUTHOR_NAME=$(git log -1 --pretty=format:'%an')
37+
AUTHOR_EMAIL=$(git log -1 --pretty=format:'%ae')
38+
39+
# Use original author for the formatting commit
40+
git config --local user.email "$AUTHOR_EMAIL"
41+
git config --local user.name "$AUTHOR_NAME"
3042
31-
# Step 5: Report status
32-
- name: Complete
33-
run: echo "Formatting completed successfully!"
43+
# Check if there are any changes
44+
if [[ -n $(git status -s) ]]; then
45+
echo "Formatting changes detected, creating commit..."
46+
echo "Committing as: $AUTHOR_NAME <$AUTHOR_EMAIL>"
47+
git add -A
48+
git commit -m "chore: Auto-format JavaScript files with Prettier"
49+
50+
# Push changes
51+
git push
52+
echo "Changes committed and pushed"
53+
else
54+
echo "No formatting changes needed"
55+
fi

‎.github/workflows/shell-format.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Shell Format Check
2+
3+
on:
4+
push:
5+
paths:
6+
- "**.sh"
7+
pull_request:
8+
paths:
9+
- "**.sh"
10+
11+
jobs:
12+
shfmt:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v4
18+
with:
19+
token: ${{ secrets.GITHUB_TOKEN }}
20+
ref: ${{ github.head_ref || github.ref }}
21+
22+
- name: Install shfmt
23+
run: |
24+
sudo apt-get update
25+
sudo apt-get install -y shfmt
26+
27+
- name: Format shell scripts
28+
run: |
29+
echo "Auto-formatting shell scripts..."
30+
# Run in check mode: if reformatting would be needed, it will fail
31+
# Use indentation space of 2 spaces
32+
shfmt -i 2 -w .
33+
echo "Formatting complete"
34+
35+
- name: Commit changes
36+
run: |
37+
# Get the original commit author info
38+
AUTHOR_NAME=$(git log -1 --pretty=format:'%an')
39+
AUTHOR_EMAIL=$(git log -1 --pretty=format:'%ae')
40+
41+
# Use original author for the formatting commit
42+
git config --local user.email "$AUTHOR_EMAIL"
43+
git config --local user.name "$AUTHOR_NAME"
44+
45+
# Check if there are any changes
46+
if [[ -n $(git status -s) ]]; then
47+
echo "Formatting changes detected, creating commit..."
48+
echo "Committing as: $AUTHOR_NAME <$AUTHOR_EMAIL>"
49+
git add -A
50+
git commit -m "chore: Auto-format shell scripts with shfmt"
51+
52+
# Push changes
53+
git push
54+
echo "Changes committed and pushed"
55+
else
56+
echo "No formatting changes needed"
57+
fi

‎.github/workflows/unit-tests.yml‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,21 @@ name: Unit-Testing
22
on: push
33
jobs:
44
unit-test:
5-
runs-on: ubuntu-24.04
5+
runs-on: ubuntu-latest
6+
container: debian:bookworm
67
if: ${{ always() }}
78
steps:
8-
- uses: actions/checkout@v4
9-
- name: Update ubuntu
10-
run: sudo apt-get update
11-
- name: Install software-properties-common
12-
run: sudo apt install software-properties-common
13-
- name: Add deadsnakes apt repository
14-
run: sudo add-apt-repository ppa:deadsnakes/ppa
15-
- name: Update to bring in deadsnakes packages
16-
run: sudo apt update
17-
- name: Install Python 3.9
18-
run: sudo apt install python3.9 python3.9-dev python3.9-venv python3.9-distutils
19-
- name: Ensure pip is installed
20-
run: python3.9 -m ensurepip
9+
- uses: actions/checkout@v2
10+
- name: Update debian
11+
run: apt update
2112
- name: Install dependencies
2213
run: |
2314
./scripts/generate_datafed.sh
24-
sudo ./scripts/install_core_dependencies.sh
25-
./scripts/generate_datafed.sh
15+
./scripts/install_core_dependencies.sh
2616
- name: Build
2717
run: |
28-
cmake -S. -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_WEB_SERVER=OFF
29-
cmake --build build -j4
18+
/opt/datafed/dependencies/bin/cmake -S. -B build -DCMAKE_BUILD_TYPE=Debug -DBUILD_WEB_SERVER=OFF
19+
/opt/datafed/dependencies/bin/cmake --build build -j4
3020
- name: Run tests
3121
run: |
32-
cmake --build build --target test
22+
/opt/datafed/dependencies/bin/cmake --build build --target test

‎.github/workflows/yaml-format.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Yaml Formatter
2+
on: push
3+
jobs:
4+
format-yaml:
5+
runs-on: ubuntu-latest
6+
7+
steps:
8+
# Step 1: Checkout the repository
9+
- name: Checkout Code
10+
uses: actions/checkout@v4
11+
12+
# Step 2: Set up Node.js environment
13+
- name: Set up Node.js
14+
uses: actions/setup-node@v4
15+
with:
16+
node-version: "18" # Specify your Node.js version
17+
18+
# Step 3: Install Prettier and ESLint globally
19+
- name: Install Prettier
20+
run: |
21+
npm install -g prettier
22+
23+
# Step 4: Run Prettier to format code
24+
- name: Run prettier
25+
run: |
26+
prettier "**/*.yml" --write
27+
git diff
28+
git reset --hard
29+
prettier --check "**/*.yml"
30+
31+
# Step 5: Report status
32+
- name: Complete
33+
run: echo "Formatting completed successfully!"

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Pre-release
22

33
## MAJOR Breaking changes
4+
1. [1336] - Changed base container for all builds to debian:bookworm-slim and addressed a majority of CVEs.
45

56
## MINOR Feature
67
1. [987] - This implements serialized GitLab CI pipelines

‎cmake/Version.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11

22

33
set(DATAFED_RELEASE_YEAR 2025)
4-
set(DATAFED_RELEASE_MONTH 6)
5-
set(DATAFED_RELEASE_DAY 11)
4+
set(DATAFED_RELEASE_MONTH 10)
5+
set(DATAFED_RELEASE_DAY 7)
66
set(DATAFED_RELEASE_HOUR 14)
77
set(DATAFED_RELEASE_MINUTE 1)
88

99
set(DATAFED_COMMON_LIB_MAJOR 1)
1010
set(DATAFED_COMMON_LIB_MINOR 0)
11-
set(DATAFED_COMMON_LIB_PATCH 1)
11+
set(DATAFED_COMMON_LIB_PATCH 2)
1212

1313
set(DATAFED_COMMON_PROTOCOL_API_MAJOR 1)
1414
set(DATAFED_COMMON_PROTOCOL_API_MINOR 1)

‎scripts/copy_dependency.sh‎

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

0 commit comments

Comments
 (0)