Skip to content

Commit 3bf25a8

Browse files
committed
idfk
1 parent b7a75c3 commit 3bf25a8

13 files changed

Lines changed: 41 additions & 29 deletions

File tree

.github/workflows/build.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
echo "Using provided services: ${{ github.event.inputs.services }}"
3232
SERVICES=$(echo "${{ github.event.inputs.services }}" | tr ',' '\n' | xargs -I {} echo '"{}"' | jq -c -s '.')
3333
else
34-
echo "Auto-detecting folders with Dockerfiles..."
35-
SERVICES=$(find . -maxdepth 2 -name Dockerfile -type f | cut -d/ -f2 | sort -u | jq -R . | jq -c -s '.')
34+
echo "Auto-detecting projects..."
35+
SERVICES=$(jq -r '.projects | keys[]' projects.json | jq -R . | jq -c -s '.')
3636
fi
3737
3838
echo "services=$SERVICES" >> $GITHUB_OUTPUT
@@ -51,11 +51,18 @@ jobs:
5151
token: ${{ secrets.GITHUB_TOKEN }}
5252
sparse-checkout: |
5353
${{ matrix.service }}
54+
projects.json
5455
sparse-checkout-cone-mode: true
5556

56-
- name: Init Submodules
57+
- name: Clone repository
5758
run: |
58-
git submodule update --init --recursive ${{ matrix.service }}
59+
REPO=$(jq -r ".projects.\"${{ matrix.service }}\".repo // empty" projects.json)
60+
61+
if [ -n "$REPO" ] && [ "$REPO" != "null" ]; then
62+
REF=$(jq -r ".projects.\"${{ matrix.service }}\".ref" projects.json)
63+
echo "Cloning $REPO:$REF into ${{ matrix.service }}/src/"
64+
git clone --depth 1 --branch "$REF" --recursive "$REPO" "${{ matrix.service }}/src"
65+
fi
5966
6067
- name: Log in to GHCR
6168
uses: docker/login-action@v3

.gitmodules

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +0,0 @@
1-
[submodule "i2pd-tools/i2pd-tools"]
2-
path = i2pd-tools/i2pd-tools
3-
url = https://github.com/purplei2p/i2pd-tools
4-
[submodule "knot/core"]
5-
path = knot/core
6-
url = https://tangled.org/@tangled.org/core
7-
[submodule "spindle/core"]
8-
path = spindle/core
9-
url = https://tangled.org/@tangled.org/core
10-
[submodule "appviewlite/AppViewLite"]
11-
path = appviewlite/AppViewLite
12-
url = https://github.com/alnkesq/AppViewLite.git
13-
[submodule "loops/loops-server"]
14-
path = loops/loops-server
15-
url = https://github.com/joinloops/loops-server.git

appviewlite/AppViewLite

Lines changed: 0 additions & 1 deletion
This file was deleted.

appviewlite/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
33
RUN mkdir /src /app
44

55
WORKDIR /src
6-
COPY ./AppViewLite .
6+
COPY ./src .
77
RUN dotnet publish src/AppViewLite.Web -c Release -o /app/publish
88

99
FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine

i2pd-tools/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apk add --no-cache \
99
zlib-dev
1010

1111
# copy sources into the layer
12-
COPY ./i2pd-tools /opt/i2pd-tools
12+
COPY ./src /opt/i2pd-tools
1313
WORKDIR /opt/i2pd-tools
1414

1515
# build all the tools

i2pd-tools/i2pd-tools

Lines changed: 0 additions & 1 deletion
This file was deleted.

knot/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ENV CGO_ENABLED=1
44

55
WORKDIR /app
66
RUN apk add gcc musl-dev
7-
COPY ./core .
7+
COPY ./src .
88
RUN go build -o /usr/bin/knot -ldflags '-s -w -extldflags "-static"' ./cmd/knot
99

1010
FROM alpine:3.21

knot/core

Lines changed: 0 additions & 1 deletion
This file was deleted.

loops/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN install-php-extensions \
4040
zip
4141

4242
# Copy application files
43-
COPY --chown=www-data:www-data ./loops-server /var/www/html
43+
COPY --chown=www-data:www-data ./src /var/www/html
4444

4545
# Set proper permissions
4646
RUN chown -R www-data:www-data /var/www/html \

loops/loops-server

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)