Skip to content

Commit

Permalink
Object creator fix (#71140)
Browse files Browse the repository at this point in the history
  • Loading branch information
physics-enthusiast authored Jan 29, 2024
1 parent 69bcaea commit 21c62bd
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 5 deletions.
9 changes: 9 additions & 0 deletions .devcontainer/graphical/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM mcr.microsoft.com/devcontainers/cpp:0-ubuntu-22.04

RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends libsdl2-dev libsdl2-ttf-dev libharfbuzz-dev \
libsdl2-image-dev libjpeg-turbo8-dev libtiff-dev libwebp-dev libzip-dev libzstd-dev \
libsdl2-mixer-dev libflac-dev libasound2-dev libfreetype6-dev build-essential astyle ccache

# [Optional] comment out this section unless you want to compile the Object Creator. Install some QT libraries
RUN apt-get -y install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools
34 changes: 34 additions & 0 deletions .devcontainer/graphical/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/cpp
{
"name": "Standard + Qt5",
"build": {
"dockerfile": "Dockerfile"
},
"customizations": {
"vscode": {
"extensions": [
"github.vscode-github-actions",
"ms-vscode.makefile-tools",
"ms-vscode.cpptools-extension-pack",
"EditorConfig.EditorConfig",
"chiehyu.vscode-astyle"
]
}
}

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "gcc -v",

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
12 changes: 7 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,9 @@ jobs:
if: matrix.artifact == 'windows-objectcreator-x64'
uses: devcontainers/[email protected]
with:
imageName: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer
cacheFrom: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer
imageName: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer-cross-compile
cacheFrom: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer-cross-compile
configFile: ./.devcontainer/cross-compile/devcontainer.json
push: always
runCmd: |
git config --global --add safe.directory /workspaces/Cataclysm-DDA
Expand All @@ -291,9 +292,10 @@ jobs:
if: matrix.artifact == 'linux-objectcreator-x64'
uses: devcontainers/[email protected]
with:
imageName: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer
cacheFrom: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer
push: never
imageName: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer-graphical
cacheFrom: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer-graphical
configFile: ./.devcontainer/graphical/devcontainer.json
push: always
runCmd: |
git config --global --add safe.directory /workspaces/Cataclysm-DDA
make -j$((`nproc`+0)) TILES=1 LINTJSON=0 RELEASE=1 object_creator
Expand Down

0 comments on commit 21c62bd

Please sign in to comment.