Skip to content

Commit 873fb2e

Browse files
author
Francisco Javier Trujillo Mata
committed
Skipping submodules because this issue
actions/checkout#363 And how they were downloaded previously it still should work
1 parent 74d49e1 commit 873fb2e

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.github/workflows/docker.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v2
1818
with:
19+
submodules: true
1920
fetch-depth: 0
2021

2122
- name: Extract DOCKER_TAG using tag name

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM $BASE_DOCKER_IMAGE
55
COPY . /src
66

77
RUN apk add build-base git
8-
RUN cd /src && make
8+
RUN cd /src && make libraries
99

1010
FROM alpine:latest
1111

Makefile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
.PHONY: submodules aalib expat freetype2 libconfig libid3tag zlib libjpeg libmad libmikmod libpng libtap libtiff lua madplay ode romfs sdl sdlgfx sdlimage sdlmixer sdlttf stlport ucl
22

33
ifneq ("$(wildcard $(GSKIT)/include/gsKit.h)","")
4-
all: submodules aalib expat freetype2 libconfig libid3tag zlib libjpeg libmad libmikmod libpng libtap libtiff lua madplay romfs sdl sdlgfx sdlimage sdlmixer sdlttf stlport ucl
4+
all: submodules libraries
5+
libraries: aalib expat freetype2 libconfig libid3tag zlib libjpeg libmad libmikmod libpng libtap libtiff lua madplay romfs sdl sdlgfx sdlimage sdlmixer sdlttf stlport ucl
56
# ode
67
else
7-
all: submodules aalib expat freetype2 libconfig libid3tag zlib libjpeg libmad libmikmod libpng libtap libtiff lua madplay romfs stlport ucl
8+
all: submodules libraries
9+
libraries: aalib expat freetype2 libconfig libid3tag zlib libjpeg libmad libmikmod libpng libtap libtiff lua madplay romfs stlport ucl
810
# ode
911
@echo "GSKIT not set and gsKit not installed.\nSDL libraries were not built."
1012
endif
@@ -23,7 +25,6 @@ expat:
2325
$(MAKE) -C $@ clean
2426

2527
freetype2:
26-
git submodule update --init freetype2
2728
cd $@; ./SetupPS2.sh
2829

2930
libconfig:
@@ -33,7 +34,6 @@ libconfig:
3334

3435
ZLIB_FLAGS = --static --prefix=$(PS2SDK)/ports
3536
zlib:
36-
git submodule update --init zlib
3737
cd $@/src && CHOST=ee CFLAGS="-O2 -G0" ./configure $(ZLIB_FLAGS)
3838
$(MAKE) -C $@/src clean
3939
$(MAKE) -C $@/src all
@@ -63,14 +63,12 @@ LIBPNG_FLAGS = --host=mips64el --enable-static=true --enable-shared=false CC=ee-
6363
LIBPNG_FLAGS += CFLAGS="-O2 -G0" CPPFLAGS="-I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include -I$(PS2SDK)/ports/include"
6464
LIBPNG_FLAGS += LDFLAGS="-L$(PS2SDK)/ee/lib -L$(PS2SDK)/ports/lib" --prefix=$(PS2SDK)/ports
6565
libpng: zlib
66-
git submodule update --init libpng
6766
cd $@/src && ./configure $(LIBPNG_FLAGS)
6867
$(MAKE) -C $@/src clean
6968
$(MAKE) -C $@/src all
7069
$(MAKE) -C $@/src install
7170

7271
libtap:
73-
git submodule update --init libtap
7472
$(MAKE) -C $@ -f Makefile.PS2 all
7573
$(MAKE) -C $@ -f Makefile.PS2 install
7674
$(MAKE) -C $@ -f Makefile.PS2 clean

0 commit comments

Comments
 (0)