Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge to staging #360

Merged
merged 13 commits into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches: [ "nam20485" ]
pull_request:
branches: [ "development", "main", "release", "nam20485" ]
branches: [ "development", "staging", "main", "release", "nam20485" ]

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: |
mv ${{ github.workspace }}/artifacts/ubuntu-22.04-artifacts/artifacts-ubuntu-22.04.zip ${{ github.workspace }}/artifacts/OdbDesign-Linux-x64.zip
mv ${{ github.workspace }}/artifacts/windows-2022-artifacts/artifacts-windows-2022.zip ${{ github.workspace }}/artifacts/OdbDesign-Windows-x64.zip
mv ${{ github.workspace }}/artifacts/macos-12-artifacts/artifacts-macos-12.zip ${{ github.workspace }}/artifacts/OdbDesign-MacOS-x64.zip
mv ${{ github.workspace }}/artifacts/macos-14-artifacts/artifacts-macos-14.zip ${{ github.workspace }}/artifacts/OdbDesign-MacOS-x64.zip
- name: Generate SHA256 Sums
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sbom-generate-submit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: SBOM Generate and Submit

on:
push:
branches: [ "main", "release", "development", "nam20485" ]
branches: [ "main", "release", "development", "staging", "nam20485" ]
workflow_dispatch:

permissions:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
# For Branch-Protection check. Only the default branch is supported. See
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
branch_protection_rule:
types: [ created, edited ]
# To guarantee Maintained check is occasionally updated. See
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
schedule:
Expand Down
11 changes: 7 additions & 4 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"CMAKE_TOOLCHAIN_FILE": {
"value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"type": "FILEPATH"
}
},
"CMAKE_SUPPRESS_DEVELOPER_WARNINGS": "TRUE"
},
"condition": {
"type": "equals",
Expand Down Expand Up @@ -77,7 +78,8 @@
"type": "FILEPATH"
},
"CMAKE_C_COMPILER": "cc",
"CMAKE_CXX_COMPILER": "c++"
"CMAKE_CXX_COMPILER": "c++",
"CMAKE_SUPPRESS_DEVELOPER_WARNINGS": "TRUE"
},
"condition": {
"type": "equals",
Expand Down Expand Up @@ -113,7 +115,7 @@
"cacheVariables": {
"CMAKE_C_COMPILER": "x86_64-w64-mingw32-gcc",
"CMAKE_CXX_COMPILER": "x86_64-w64-mingw32-g++",
"CMAKE_CXX_FLAGS": "-static-libgcc -static-libstdc++"
"CMAKE_CXX_FLAGS": "-static-libgcc -static-libstdc++"
}
},
{
Expand All @@ -138,7 +140,8 @@
"type": "FILEPATH"
},
"CMAKE_C_COMPILER": "cc",
"CMAKE_CXX_COMPILER": "c++"
"CMAKE_CXX_COMPILER": "c++",
"CMAKE_SUPPRESS_DEVELOPER_WARNINGS": "TRUE"
},
"condition": {
"type": "equals",
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM debian:bookworm-20240722-slim@sha256:5f7d5664eae4a192c2d2d6cb67fc3f3c7891a8722cd2903cc35aa649a12b0c8d AS build
FROM --platform=$BUILDPLATFORM debian:bookworm-20250113-slim@sha256:f70dc8d6a8b6a06824c92471a1a258030836b26b043881358b967bf73de7c5ab AS build

ARG OWNER=nam20485
ARG GITHUB_TOKEN="PASSWORD"
Expand Down Expand Up @@ -52,6 +52,7 @@ RUN mono `./vcpkg fetch nuget | tail -n 1` \
RUN mkdir -p /src/OdbDesign
WORKDIR /src/OdbDesign
COPY ./vcpkg.json .
COPY ./vcpkg-configuration.json .
RUN ${VCPKG_ROOT}/vcpkg install
# RUN --mount=type=cache,target=/root/.cache \
# ${VCPKG_ROOT}/vcpkg install
Expand All @@ -68,7 +69,7 @@ RUN cmake --build --preset linux-release
# RUN cmake --build --preset linux-debug

# much smaller runtime image
FROM --platform=$BUILDPLATFORM debian:bookworm-20240722-slim@sha256:5f7d5664eae4a192c2d2d6cb67fc3f3c7891a8722cd2903cc35aa649a12b0c8d AS run
FROM --platform=$BUILDPLATFORM debian:bookworm-20250113-slim@sha256:f70dc8d6a8b6a06824c92471a1a258030836b26b043881358b967bf73de7c5ab AS run
# ARG ODBDESIGN_SERVER_REQUEST_USERNAME=""
# ARG ODBDESIGN_SERVER_REQUEST_PASSWORD=""
LABEL org.opencontainers.image.source=https://github.com/nam20485/OdbDesign \
Expand Down
Loading