Skip to content

Commit 1d9e4a2

Browse files
nam20485nam20485
authored
merge to main (#153)
2 parents 2b1568e + 5618cf3 commit 1d9e4a2

File tree

150 files changed

+29569
-1931
lines changed

Some content is hidden

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

150 files changed

+29569
-1931
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
# os == windows-2022
104104
#
105105
- name: Setup VC Tools
106-
uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1
106+
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
107107
if: matrix.os == 'windows-2022'
108108

109109
- name: Patch vcpkg
@@ -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@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
193+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.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@9bc31d5ccc31df68ecc42ccf4149144866c47d8a" # v3.0.2
219+
uses: "actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110" # v4.1.0
220220
with:
221221
path: ${{ github.workspace }}/artifacts
222222

@@ -235,7 +235,7 @@ jobs:
235235
sha256sum OdbDesign-MacOS-x64.zip > OdbDesign-MacOS-x64.zip.sha256sum
236236
237237
- name: Import GPG Key
238-
uses: crazy-max/ghaction-import-gpg@82a020f1f7f605c65dd2449b392a52c3fcfef7ef # v6.0.0
238+
uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0
239239
with:
240240
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
241241
passphrase: ${{ secrets.PASSPHRASE }}

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@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
50+
uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
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@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
81+
uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
8282
with:
8383
category: "/language:${{matrix.language}}"

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@ on:
1212
branches: [ "main", "release", "development", "nam20485" ]
1313

1414
permissions:
15-
contents: read
15+
contents: read
1616

1717
jobs:
1818
dependency-review:
1919
runs-on: ubuntu-latest
2020
permissions:
2121
contents: write
22+
pull-requests: write
2223

2324
steps:
2425
- name: 'Checkout Repository'
2526
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2627
- name: 'Dependency Review'
27-
uses: actions/dependency-review-action@7bbfa034e752445ea40215fff1c3bf9597993d3f # v3.1.3
28+
uses: actions/dependency-review-action@01bc87099ba56df1e897b6874784491ea6309bc4 # v3.1.4
2829
with:
2930
comment-summary-in-pr: true

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ jobs:
5151

5252
- name: cosign-installer
5353
if: github.event_name != 'pull_request'
54-
uses: sigstore/cosign-installer@1fc5bd396d372bee37d608f955b336615edf79c8 # v3.2.0
54+
uses: sigstore/cosign-installer@9614fae9e5c5eddabb09f90a270fcb487c9f7149 # v3.3.0
5555

5656
# Workaround: https://github.com/docker/build-push-action/issues/461
5757
- name: Setup Docker buildx
58-
uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
58+
uses: docker/setup-buildx-action@edfb0fe6204400c56fbfd3feba3fe9ad1adfa345
5959

6060
# Login against a Docker registry except on PR
6161
# https://github.com/docker/login-action
@@ -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@96383f45573cb7f253c731d3b3ab81c87ef81934
74+
uses: docker/metadata-action@9dc751fe249ad99385a2583ee0d084c400eee04e
7575
with:
7676
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
7777
tags: |

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
# Workaround: https://github.com/docker/build-push-action/issues/461
6161
- name: Setup Docker buildx
62-
uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
62+
uses: docker/setup-buildx-action@edfb0fe6204400c56fbfd3feba3fe9ad1adfa345
6363

6464
# # Login against GHCR Docker registry except on PR
6565
# # https://github.com/docker/login-action
@@ -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@96383f45573cb7f253c731d3b3ab81c87ef81934
86+
uses: docker/metadata-action@9dc751fe249ad99385a2583ee0d084c400eee04e
8787
with:
8888
images: ${{ env.IMAGE_NAME }}
8989
tags: |
@@ -128,7 +128,7 @@ jobs:
128128
- name: Analyze for critical and high CVEs
129129
id: docker-scout-cves
130130
# if: ${{ github.event_name != 'pull_request_target' }}
131-
uses: docker/scout-action@704685e6e6dc4462258fb11d36d3a14ca7bda1e6 # v1.1.0
131+
uses: docker/scout-action@b7413c99043c2a9131c0fa39cedaece80f285788 # v1.2.2
132132
with:
133133
command: cves,recommendations
134134
image: ${{ steps.meta.outputs.tags }}
@@ -138,14 +138,14 @@ jobs:
138138

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

145145
- name: Docker Scout Compare to Latest
146146
id: docker-scout
147147
if: ${{ github.event_name == 'pull_request' }}
148-
uses: docker/scout-action@704685e6e6dc4462258fb11d36d3a14ca7bda1e6 # v1.1.0
148+
uses: docker/scout-action@b7413c99043c2a9131c0fa39cedaece80f285788 # v1.2.2
149149
with:
150150
command: compare
151151
image: ${{ steps.meta.outputs.tags }}

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@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
64+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.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@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
72+
uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
7373
with:
7474
sarif_file: results.sarif

Diff for: ‎.gitignore

+11-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,14 @@ testlog.txt
3333
testlog.txt.tmp*
3434
testlog.xml
3535
/OdbDesignTests/FileArchiveLoadTests_Local.cpp
36-
/OdbDesignTests/DesignNameTests.cpp
36+
/OdbDesignTests/CMakeLists_Local.txt
37+
/OdbDesignTests/DesignNameTests_Local.cpp
38+
/output
39+
OdbDesignServer/api/__pycache__/
40+
OdbDesignServer/api/migrations/__pycache__/
41+
OdbDesignServer/OdbDesignServer/__pycache__/
42+
OdbDesignServer/PyOdbDesignLib/__pycache__/
43+
OdbDesignServer/PyOdbDesignLib/PyOdbDesignLib.py
44+
OdbDesignServer/db.sqlite3
45+
OdbDesignServer/PyOdbDesignLib/_PyOdbDesignLib.pyd
46+
/TEST_DATA.zip

Diff for: ‎CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ set(CXX_STANDARD ${MY_CXX_STANDARD})
1111
set(CMAKE_CXX_STANDARD ${MY_CXX_STANDARD})
1212
set(CMAKE_CXX_STANDARD_REQUIRED True)
1313

14+
# only use ccache locally, i.e. not in CI
15+
if (NOT DEFINED ENV{CI})
16+
set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_EXE}")
17+
endif()
18+
1419
# required for SWIG python wrapper
1520
#set(CMAKE_POSITION_INDEPENDENT_CODE ON)
1621

Diff for: ‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-20231120@sha256:133a1f2aa9e55d1c93d0ae1aaa7b94fb141265d0ee3ea677175cdb96f5f990e5 AS build
1+
FROM debian:bookworm-20231218@sha256:bac353db4cc04bc672b14029964e686cd7bad56fe34b51f432c1a1304b9928da 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-20231120-slim@sha256:2bc5c236e9b262645a323e9088dfa3bb1ecb16cc75811daf40a23a824d665be9 AS run
69+
FROM debian:bookworm-20231218-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 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-20231120-slim@sha256:2bc5c236e9b262645a323e9088dfa3bb1ecb16cc75811daf40a23a824d665be9 AS build
1+
FROM debian:bookworm-20231218-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 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-20231120-slim@sha256:2bc5c236e9b262645a323e9088dfa3bb1ecb16cc75811daf40a23a824d665be9 AS run
55+
FROM debian:bookworm-20231218-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 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-20231120-slim@sha256:2bc5c236e9b262645a323e9088dfa3bb1ecb16cc75811daf40a23a824d665be9 AS build
1+
FROM debian:bookworm-20231218-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 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-20231120-slim@sha256:2bc5c236e9b262645a323e9088dfa3bb1ecb16cc75811daf40a23a824d665be9 as run
47+
FROM debian:bookworm-20231218-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 as run
4848

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

0 commit comments

Comments
 (0)