Skip to content

Commit 860947b

Browse files
committed
Setup cloudbuild stuff
1 parent 2774f8b commit 860947b

File tree

4 files changed

+23
-2
lines changed

4 files changed

+23
-2
lines changed

Dockerfile

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM ubuntu
2+
ADD . .
3+
RUN apt-get -y update
4+
RUN apt-get -y install make gcc clang
5+
ENTRYPOINT [ "./build.sh" ]

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ deinstall:
2323
rm -f $(PREFIX)/bin/subcalc
2424

2525
clean:
26-
rm -f subcalc
26+
rm -rf subcalc subcalc.dSYM

cloudbuild.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
steps:
2+
- name: 'gcr.io/cloud-builders/docker'
3+
id: Build
4+
args:
5+
- 'build'
6+
- '-t'
7+
- 'gcr.io/csjp-gcloud/subcalc'
8+
- '.'
9+
10+
- name: 'gcr.io/csjp-gcloud/subcalc'
11+
id: Run build
12+
entrypoint: /build.sh
13+
14+
- name: 'gcr.io/csjp-gcloud/subcalc'
15+
id: Test build
16+
entrypoint: /test.sh

subcalc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#define IPV6WIDTH 128
3434
#define IPWIDTH 32
3535

36-
#if defined(__linux__)
36+
#if defined(linux)
3737
#define s6_addr32 __in6_u.__u6_addr32
3838
#define s6_addr8 __in6_u.__u6_addr8
3939
#else /* NB: BSD/OSX may require others */

0 commit comments

Comments
 (0)