Skip to content

Commit 9dd01d9

Browse files
nam20485nam20485
authored
merge to main (#159)
2 parents 5618cf3 + 9da8b7f commit 9dd01d9

25 files changed

+1067
-53
lines changed

Diff for: ‎.github/workflows/cmake-multi-platform.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ jobs:
190190
Compress-Archive -Path "${{env.ARTIFACTS_DIR_WIN}}\*.dll","${{env.ARTIFACTS_DIR_WIN}}\*.exe" -DestinationPath "${{env.ARTIFACTS_DIR_WIN}}\artifacts-${{matrix.os}}.zip" -Verbose -Force
191191
192192
- name: Upload Artifacts
193-
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
193+
uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
194194
with:
195195
name: ${{ matrix.os }}-artifacts
196196
path: ${{ env.ARTIFACTS_DIR }}/artifacts-${{matrix.os}}.zip
@@ -216,7 +216,7 @@ jobs:
216216

217217
# download the artifacts
218218
- name: "Download artifacts"
219-
uses: "actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110" # v4.1.0
219+
uses: "actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935" # v4.1.1
220220
with:
221221
path: ${{ github.workspace }}/artifacts
222222

Diff for: ‎.github/workflows/codeql.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
# Initializes the CodeQL tools for scanning.
4949
- name: Initialize CodeQL
50-
uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
50+
uses: github/codeql-action/init@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
5151
with:
5252
languages: ${{ matrix.language }}
5353
config-file: ${{ github.workspace }}/.github/codeql-config.yml
@@ -78,6 +78,6 @@ jobs:
7878
run: cmake --build --preset linux-release
7979

8080
- name: Perform CodeQL Analysis
81-
uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
81+
uses: github/codeql-action/analyze@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
8282
with:
8383
category: "/language:${{matrix.language}}"

Diff for: ‎.github/workflows/dependency-review.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
- name: 'Checkout Repository'
2626
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2727
- name: 'Dependency Review'
28-
uses: actions/dependency-review-action@01bc87099ba56df1e897b6874784491ea6309bc4 # v3.1.4
28+
uses: actions/dependency-review-action@c74b580d73376b7750d3d2a50bfb8adc2c937507 # v3.1.5
2929
with:
3030
comment-summary-in-pr: true

Diff for: ‎.github/workflows/docker-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
# https://github.com/docker/metadata-action
7272
- name: Extract Docker metadata
7373
id: meta
74-
uses: docker/metadata-action@9dc751fe249ad99385a2583ee0d084c400eee04e
74+
uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c
7575
with:
7676
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
7777
tags: |

Diff for: ‎.github/workflows/docker-scout-scan.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
# https://github.com/docker/metadata-action
8484
- name: Extract Docker metadata
8585
id: meta
86-
uses: docker/metadata-action@9dc751fe249ad99385a2583ee0d084c400eee04e
86+
uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c
8787
with:
8888
images: ${{ env.IMAGE_NAME }}
8989
tags: |
@@ -138,7 +138,7 @@ jobs:
138138

139139
- name: Upload SARIF result
140140
id: upload-sarif
141-
uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
141+
uses: github/codeql-action/upload-sarif@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
142142
with:
143143
sarif_file: sarif.output.json
144144

Diff for: ‎.github/workflows/scorecard.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ jobs:
6161
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6262
# format to the repository Actions tab.
6363
- name: "Upload artifact"
64-
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
64+
uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
6565
with:
6666
name: SARIF file
6767
path: results.sarif
6868
retention-days: 5
6969

7070
# Upload the results to GitHub's code scanning dashboard.
7171
- name: "Upload to code-scanning"
72-
uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
72+
uses: github/codeql-action/upload-sarif@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
7373
with:
7474
sarif_file: results.sarif

Diff for: ‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-20231218@sha256:bac353db4cc04bc672b14029964e686cd7bad56fe34b51f432c1a1304b9928da AS build
1+
FROM debian:bookworm-20240110@sha256:b16cef8cbcb20935c0f052e37fc3d38dc92bfec0bcfb894c328547f81e932d67 AS build
22

33
ARG OWNER=nam20485
44
ARG GITHUB_TOKEN="PASSWORD"
@@ -66,7 +66,7 @@ RUN cmake --build --preset linux-release
6666
# RUN cmake --build --preset linux-debug
6767

6868
# much smaller runtime image
69-
FROM debian:bookworm-20231218-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 AS run
69+
FROM debian:bookworm-20240110-slim@sha256:f4a83aa865a2b4a064ff142aa91c713180df9fcb86ce676b5de2981029379c37 AS run
7070
LABEL org.opencontainers.image.source=https://github.com/nam20485/OdbDesign
7171
LABEL org.opencontainers.image.authors=https://github.com/nam20485
7272
LABEL org.opencontainers.image.description="The OdbDesign Docker image runs the OdbDesignServer REST API server executable, listening on port 8888."

Diff for: ‎Dockerfile (exe)

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-20231218-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 AS build
1+
FROM debian:bookworm-20240110-slim@sha256:f4a83aa865a2b4a064ff142aa91c713180df9fcb86ce676b5de2981029379c37 AS build
22

33
# install dependencies
44
RUN apt-get update && \
@@ -52,7 +52,7 @@ RUN cp /src/OdbDesign/out/build/linux-release/OdbDesignLib/libOdbDesign.so ./_Py
5252
#RUN python3 -m build
5353

5454
# much smaller runtime image
55-
FROM debian:bookworm-20231218-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 AS run
55+
FROM debian:bookworm-20240110-slim@sha256:f4a83aa865a2b4a064ff142aa91c713180df9fcb86ce676b5de2981029379c37 AS run
5656

5757
RUN mkdir /OdbDesign
5858
WORKDIR /OdbDesign

Diff for: ‎Dockerfile_PyOdbDesignServer

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-20231218-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 AS build
1+
FROM debian:bookworm-20240110-slim@sha256:f4a83aa865a2b4a064ff142aa91c713180df9fcb86ce676b5de2981029379c37 AS build
22

33
# install dependencies
44
RUN apt-get update && \
@@ -44,7 +44,7 @@ RUN cmake --build --preset python-linux-release
4444

4545
# much smaller runtime image
4646
#FROM python:3.11.4-bullseye AS run
47-
FROM debian:bookworm-20231218-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 as run
47+
FROM debian:bookworm-20240110-slim@sha256:f4a83aa865a2b4a064ff142aa91c713180df9fcb86ce676b5de2981029379c37 as run
4848

4949
# copy PyOdbDesignServer files
5050
COPY --from=build /src/OdbDesign/PyOdbDesignServer PyOdbDesignServer

Diff for: ‎OdbDesignLib/App/IOdbServerApp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Odb::Lib::App
1010
public:
1111
virtual ~IOdbServerApp() {}
1212

13-
virtual crow::SimpleApp& crow_app() = 0;
13+
virtual CrowApp& crow_app() = 0;
1414

1515
protected:
1616
IOdbServerApp() = default;

Diff for: ‎OdbDesignLib/App/OdbServerAppBase.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace Odb::Lib::App
7777
return ExitCode::Success;
7878
}
7979

80-
crow::SimpleApp& OdbServerAppBase::crow_app()
80+
CrowApp& OdbServerAppBase::crow_app()
8181
{
8282
return m_crowApp;
8383
}

Diff for: ‎OdbDesignLib/App/OdbServerAppBase.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Odb::Lib::App
1313
OdbServerAppBase(int argc, char* argv[]);
1414
virtual ~OdbServerAppBase();
1515

16-
crow::SimpleApp& crow_app() override;
16+
CrowApp& crow_app() override;
1717

1818
Utils::ExitCode Run() override;
1919

@@ -24,7 +24,8 @@ namespace Odb::Lib::App
2424
virtual void add_controllers() = 0;
2525

2626
private:
27-
crow::SimpleApp m_crowApp;
27+
CrowApp m_crowApp;
28+
//crow::SimpleApp m_crowApp;
2829

2930
void register_routes();
3031

Diff for: ‎OdbDesignLib/FileModel/Design/AttrListFile.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace Odb::Lib::FileModel::Design
4444
loginfo("checking for extraction...");
4545

4646
std::filesystem::path featuresFilePath;
47-
for (const std::string& featuresFilename : ATTRLIST_FILENAMES)
47+
for (const std::string featuresFilename : ATTRLIST_FILENAMES)
4848
{
4949
loginfo("trying attrlist file: [" + featuresFilename + "]...");
5050

Diff for: ‎OdbDesignLib/FileModel/Design/ComponentsFile.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ namespace Odb::Lib::FileModel::Design
311311
loginfo("checking for extraction...");
312312

313313
std::filesystem::path componentsFilePath;
314-
for (const std::string& componentsFilename : COMPONENTS_FILENAMES)
314+
for (const std::string componentsFilename : COMPONENTS_FILENAMES)
315315
{
316316
loginfo("trying components file: [" + componentsFilename + "]...");
317317

Diff for: ‎OdbDesignLib/FileModel/Design/FeaturesFile.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ namespace Odb::Lib::FileModel::Design
5353
}
5454

5555
std::filesystem::path featuresFilePath;
56-
for (const std::string& featuresFilename : filenames)
56+
for (const std::string featuresFilename : filenames)
5757
{
5858
loginfo("trying features file: [" + featuresFilename + "]...");
5959

0 commit comments

Comments
 (0)