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.

Sign up for GitHub

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

provide docker file for github builds with cmake #62

Closed
wants to merge 1 commit into from
Closed

provide docker file for github builds with cmake #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

runs-on: ubuntu-22.04
container:
image: ballaswag/guppydev:latest
image: pellcorp/guppydev:latest
options: --user 1001

env:
Expand Down
18 changes: 18 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM ubuntu:22.04
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe just do FROM ballaswag/guppydev:latest then RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ apt-get install -y --no-install-recommends cmake apt-get clean all && \ apt-get -y autoremove

Will try this and publish one with cmake


RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
apt-get install -y --no-install-recommends wget build-essential cmake git ca-certificates && update-ca-certificates && \
apt-get clean all && \
apt-get -y autoremove

RUN mkdir /toolchains && \
wget "https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-2020.11/binrel/gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu.tar.xz?revision=972019b5-912f-4ae6-864a-f61f570e2e7e&rev=972019b5912f4ae6864af61f570e2e7e&hash=A973F165C6D012E0738F90FB4A0C2BA7" -O /tmp/gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu.tar.xz && \
wget https://github.com/ballaswag/k1-discovery/releases/download/1.0.0/mips-gcc720-glibc229.tar.gz -O /tmp/mips-gcc720-glibc229.tar.gz && \
tar -Jxf /tmp/gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu.tar.xz -C /toolchains && \
tar -zxf /tmp/mips-gcc720-glibc229.tar.gz -C /toolchains && \
rm /tmp/mips-gcc720-glibc229.tar.gz && \
rm /tmp/gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu.tar.xz

ENV PATH=/toolchains/gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu/bin:/toolchains/mips-gcc720-glibc229/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
WORKDIR /toolchains
CMD ["/bin/bash"]
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ libhv.a:

libspdlog.a:
@mkdir -p $(SPDLOG_DIR)/build
@cmake -B $(SPDLOG_DIR)/build -S $(SPDLOG_DIR)/
@cmake -B $(SPDLOG_DIR)/build -S $(SPDLOG_DIR)/ -DCMAKE_CXX_COMPILER=$(CXX)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed? Are line 5 and 6 where CC/CXX are defined no enough?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my local environment I could not get cmake to work without it, but perhaps that was only on the command line.

$(MAKE) -C $(SPDLOG_DIR)/build -j$(nproc)

wpaclient:
Expand Down
Loading