Skip to content

Commit

Permalink
merge to release (#160)
Browse files Browse the repository at this point in the history
  • Loading branch information
nam20485 committed Jan 16, 2024
2 parents 1d9e4a2 + 9dd01d9 commit 7381452
Show file tree
Hide file tree
Showing 25 changed files with 1,067 additions and 53 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ jobs:
Compress-Archive -Path "${{env.ARTIFACTS_DIR_WIN}}\*.dll","${{env.ARTIFACTS_DIR_WIN}}\*.exe" -DestinationPath "${{env.ARTIFACTS_DIR_WIN}}\artifacts-${{matrix.os}}.zip" -Verbose -Force
- name: Upload Artifacts
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
with:
name: ${{ matrix.os }}-artifacts
path: ${{ env.ARTIFACTS_DIR }}/artifacts-${{matrix.os}}.zip
Expand All @@ -216,7 +216,7 @@ jobs:

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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
uses: github/codeql-action/analyze@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ jobs:
- name: 'Checkout Repository'
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: 'Dependency Review'
uses: actions/dependency-review-action@01bc87099ba56df1e897b6874784491ea6309bc4 # v3.1.4
uses: actions/dependency-review-action@c74b580d73376b7750d3d2a50bfb8adc2c937507 # v3.1.5
with:
comment-summary-in-pr: true
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@9dc751fe249ad99385a2583ee0d084c400eee04e
uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-scout-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@9dc751fe249ad99385a2583ee0d084c400eee04e
uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c
with:
images: ${{ env.IMAGE_NAME }}
tags: |
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:

- name: Upload SARIF result
id: upload-sarif
uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
uses: github/codeql-action/upload-sarif@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
with:
sarif_file: sarif.output.json

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
uses: github/codeql-action/upload-sarif@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
with:
sarif_file: results.sarif
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-20231218@sha256:bac353db4cc04bc672b14029964e686cd7bad56fe34b51f432c1a1304b9928da AS build
FROM debian:bookworm-20240110@sha256:b16cef8cbcb20935c0f052e37fc3d38dc92bfec0bcfb894c328547f81e932d67 AS build

ARG OWNER=nam20485
ARG GITHUB_TOKEN="PASSWORD"
Expand Down Expand Up @@ -66,7 +66,7 @@ RUN cmake --build --preset linux-release
# RUN cmake --build --preset linux-debug

# much smaller runtime image
FROM debian:bookworm-20231218-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 AS run
FROM debian:bookworm-20240110-slim@sha256:f4a83aa865a2b4a064ff142aa91c713180df9fcb86ce676b5de2981029379c37 AS run
LABEL org.opencontainers.image.source=https://github.com/nam20485/OdbDesign
LABEL org.opencontainers.image.authors=https://github.com/nam20485
LABEL org.opencontainers.image.description="The OdbDesign Docker image runs the OdbDesignServer REST API server executable, listening on port 8888."
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile (exe)
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-20231218-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 AS build
FROM debian:bookworm-20240110-slim@sha256:f4a83aa865a2b4a064ff142aa91c713180df9fcb86ce676b5de2981029379c37 AS build

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

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

RUN mkdir /OdbDesign
WORKDIR /OdbDesign
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile_PyOdbDesignServer
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-20231218-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 AS build
FROM debian:bookworm-20240110-slim@sha256:f4a83aa865a2b4a064ff142aa91c713180df9fcb86ce676b5de2981029379c37 AS build

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

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

# copy PyOdbDesignServer files
COPY --from=build /src/OdbDesign/PyOdbDesignServer PyOdbDesignServer
Expand Down
2 changes: 1 addition & 1 deletion OdbDesignLib/App/IOdbServerApp.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Odb::Lib::App
public:
virtual ~IOdbServerApp() {}

virtual crow::SimpleApp& crow_app() = 0;
virtual CrowApp& crow_app() = 0;

protected:
IOdbServerApp() = default;
Expand Down
2 changes: 1 addition & 1 deletion OdbDesignLib/App/OdbServerAppBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ namespace Odb::Lib::App
return ExitCode::Success;
}

crow::SimpleApp& OdbServerAppBase::crow_app()
CrowApp& OdbServerAppBase::crow_app()
{
return m_crowApp;
}
Expand Down
5 changes: 3 additions & 2 deletions OdbDesignLib/App/OdbServerAppBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Odb::Lib::App
OdbServerAppBase(int argc, char* argv[]);
virtual ~OdbServerAppBase();

crow::SimpleApp& crow_app() override;
CrowApp& crow_app() override;

Utils::ExitCode Run() override;

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

private:
crow::SimpleApp m_crowApp;
CrowApp m_crowApp;
//crow::SimpleApp m_crowApp;

void register_routes();

Expand Down
2 changes: 1 addition & 1 deletion OdbDesignLib/FileModel/Design/AttrListFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace Odb::Lib::FileModel::Design
loginfo("checking for extraction...");

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

Expand Down
2 changes: 1 addition & 1 deletion OdbDesignLib/FileModel/Design/ComponentsFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ namespace Odb::Lib::FileModel::Design
loginfo("checking for extraction...");

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

Expand Down
2 changes: 1 addition & 1 deletion OdbDesignLib/FileModel/Design/FeaturesFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ namespace Odb::Lib::FileModel::Design
}

std::filesystem::path featuresFilePath;
for (const std::string& featuresFilename : filenames)
for (const std::string featuresFilename : filenames)

Check warning on line 56 in OdbDesignLib/FileModel/Design/FeaturesFile.cpp

View workflow job for this annotation

GitHub Actions / CMake-Multi-Platform-Build (ubuntu-22.04, linux-release)

loop variable ‘featuresFilename’ creates a copy from type ‘const string’ {aka ‘const std::__cxx11::basic_string<char>’} [-Wrange-loop-construct]

Check warning on line 56 in OdbDesignLib/FileModel/Design/FeaturesFile.cpp

View workflow job for this annotation

GitHub Actions / CMake-Multi-Platform-Build (macos-12, macos-release)

loop variable 'featuresFilename' creates a copy from type 'const std::string' (aka 'const basic_string<char, char_traits<char>, allocator<char>>') [-Wrange-loop-construct]
{
loginfo("trying features file: [" + featuresFilename + "]...");

Expand Down
Loading

0 comments on commit 7381452

Please sign in to comment.