diff --git a/.dockerignore b/.dockerignore index b04dde4a..c59e6784 100644 --- a/.dockerignore +++ b/.dockerignore @@ -12,8 +12,10 @@ !proto !scripts/run-clustered.sh !dashboard +!scheduled_tasks # Re-exclude host build artifact directories **/bin **/obj -**/target \ No newline at end of file +**/target +**/node_modules \ No newline at end of file diff --git a/.github/workflows/scheduled_tasks.yml b/.github/workflows/scheduled_tasks.yml index da58d38d..ab7c0373 100644 --- a/.github/workflows/scheduled_tasks.yml +++ b/.github/workflows/scheduled_tasks.yml @@ -5,6 +5,7 @@ on: branches: [main] paths: - 'scheduled_tasks/**' + - 'Dockerfile.scheduled_tasks' jobs: deploy: @@ -30,5 +31,5 @@ jobs: ghcr.io/pluralkit/scheduled_tasks:${{ env.BRANCH_NAME }} ghcr.io/pluralkit/scheduled_tasks:${{ github.sha }} ghcr.io/pluralkit/scheduled_tasks:latest - cache-from: type=registry,ref=ghcr.io/pluralkit/scheduled_tasks:${{ env.BRANCH_NAME }} + cache-from: type=registry,ref=ghcr.io/pluralkit/scheduledtasks:${{ env.BRANCH_NAME }} cache-to: type=inline diff --git a/Dockerfile b/Dockerfile index cfc1c1c8..9d97795c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,6 @@ COPY Myriad/Myriad.csproj /app/Myriad/ COPY PluralKit.API/PluralKit.API.csproj /app/PluralKit.API/ COPY PluralKit.Bot/PluralKit.Bot.csproj /app/PluralKit.Bot/ COPY PluralKit.Core/PluralKit.Core.csproj /app/PluralKit.Core/ -COPY PluralKit.ScheduledTasks/PluralKit.ScheduledTasks.csproj /app/PluralKit.ScheduledTasks/ COPY PluralKit.Tests/PluralKit.Tests.csproj /app/PluralKit.Tests/ COPY .git/ /app/.git COPY proto/ /app/proto diff --git a/Dockerfile.scheduled_tasks b/Dockerfile.scheduled_tasks index d18d5b71..032f188e 100644 --- a/Dockerfile.scheduled_tasks +++ b/Dockerfile.scheduled_tasks @@ -3,6 +3,7 @@ FROM alpine:latest AS builder RUN apk add go WORKDIR /build + COPY scheduled_tasks/ /build RUN go build . diff --git a/PluralKit.sln b/PluralKit.sln index fec6b6e3..b1a66c75 100644 --- a/PluralKit.sln +++ b/PluralKit.sln @@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralKit.Tests", "PluralKi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Myriad", "Myriad\Myriad.csproj", "{ACB9BF37-F29C-4068-A7D1-2EFF2C308C4B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralKit.ScheduledTasks", "PluralKit.ScheduledTasks\PluralKit.ScheduledTasks.csproj", "{374A8EB3-655D-4230-982B-459AE3553991}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU