diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb267f8..c8d7360 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,14 +20,8 @@ jobs: with: go-version: "^1.26.0" - - name: Initialize submodules - run: | - git submodule init - git submodule update - - - name: Apply patches - run: | - git apply --directory paerser/ patches/nested_maps.diff + - name: Go dependencies + run: go mod download - name: Install frontend dependencies run: | diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 656eaa9..2278a3d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -63,15 +63,6 @@ jobs: with: go-version: "^1.26.0" - - name: Initialize submodules - run: | - git submodule init - git submodule update - - - name: Apply patches - run: | - git apply --directory paerser/ patches/nested_maps.diff - - name: Install frontend dependencies run: | cd frontend @@ -118,15 +109,6 @@ jobs: with: go-version: "^1.26.0" - - name: Initialize submodules - run: | - git submodule init - git submodule update - - - name: Apply patches - run: | - git apply --directory paerser/ patches/nested_maps.diff - - name: Install frontend dependencies run: | cd frontend @@ -165,15 +147,6 @@ jobs: with: ref: nightly - - name: Initialize submodules - run: | - git submodule init - git submodule update - - - name: Apply patches - run: | - git apply --directory paerser/ patches/nested_maps.diff - - name: Docker meta id: meta uses: docker/metadata-action@v6 @@ -232,15 +205,6 @@ jobs: with: ref: nightly - - name: Initialize submodules - run: | - git submodule init - git submodule update - - - name: Apply patches - run: | - git apply --directory paerser/ patches/nested_maps.diff - - name: Docker meta id: meta uses: docker/metadata-action@v6 @@ -299,15 +263,6 @@ jobs: with: ref: nightly - - name: Initialize submodules - run: | - git submodule init - git submodule update - - - name: Apply patches - run: | - git apply --directory paerser/ patches/nested_maps.diff - - name: Docker meta id: meta uses: docker/metadata-action@v6 @@ -366,15 +321,6 @@ jobs: with: ref: nightly - - name: Initialize submodules - run: | - git submodule init - git submodule update - - - name: Apply patches - run: | - git apply --directory paerser/ patches/nested_maps.diff - - name: Docker meta id: meta uses: docker/metadata-action@v6 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fde829b..241f92f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,15 +39,6 @@ jobs: with: go-version: "^1.26.0" - - name: Initialize submodules - run: | - git submodule init - git submodule update - - - name: Apply patches - run: | - git apply --directory paerser/ patches/nested_maps.diff - - name: Install frontend dependencies run: | cd frontend @@ -91,15 +82,6 @@ jobs: with: go-version: "^1.26.0" - - name: Initialize submodules - run: | - git submodule init - git submodule update - - - name: Apply patches - run: | - git apply --directory paerser/ patches/nested_maps.diff - - name: Install frontend dependencies run: | cd frontend @@ -135,15 +117,6 @@ jobs: - name: Checkout uses: actions/checkout@v6 - - name: Initialize submodules - run: | - git submodule init - git submodule update - - - name: Apply patches - run: | - git apply --directory paerser/ patches/nested_maps.diff - - name: Docker meta id: meta uses: docker/metadata-action@v6 @@ -199,15 +172,6 @@ jobs: - name: Checkout uses: actions/checkout@v6 - - name: Initialize submodules - run: | - git submodule init - git submodule update - - - name: Apply patches - run: | - git apply --directory paerser/ patches/nested_maps.diff - - name: Docker meta id: meta uses: docker/metadata-action@v6 @@ -263,15 +227,6 @@ jobs: - name: Checkout uses: actions/checkout@v6 - - name: Initialize submodules - run: | - git submodule init - git submodule update - - - name: Apply patches - run: | - git apply --directory paerser/ patches/nested_maps.diff - - name: Docker meta id: meta uses: docker/metadata-action@v6 @@ -327,15 +282,6 @@ jobs: - name: Checkout uses: actions/checkout@v6 - - name: Initialize submodules - run: | - git submodule init - git submodule update - - - name: Apply patches - run: | - git apply --directory paerser/ patches/nested_maps.diff - - name: Docker meta id: meta uses: docker/metadata-action@v6 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 066cd58..80239bd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,26 +19,9 @@ git clone https://github.com/steveiliop56/tinyauth cd tinyauth ``` -## Initialize Submodules +## Installing Dependencies -The project uses Git submodules for some dependencies, so you need to initialize them with: - -```sh -git submodule init -git submodule update -``` - -## Apply patches - -Some of the dependencies must be patched in order to work correctly with the project, you can apply the patches by running: - -```sh -git apply --directory paerser/ patches/nested_maps.diff -``` - -## Installing Requirements - -While development occurs within Docker, installing the requirements locally is recommended to avoid import errors. Install the Go dependencies: +While development occurs within Docker, installing the dependencies locally is recommended to avoid import errors. Install the Go dependencies: ```sh go mod tidy diff --git a/Dockerfile b/Dockerfile index 1f7cb1d..f0ab937 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,8 +28,6 @@ ARG BUILD_TIMESTAMP WORKDIR /tinyauth -COPY ./paerser ./paerser - COPY go.mod ./ COPY go.sum ./ diff --git a/Dockerfile.dev b/Dockerfile.dev index 9d92dff..67985dd 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -2,8 +2,6 @@ FROM golang:1.26-alpine3.23 WORKDIR /tinyauth -COPY ./paerser ./paerser - COPY go.mod ./ COPY go.sum ./ diff --git a/Dockerfile.distroless b/Dockerfile.distroless index 135d5de..98988fa 100644 --- a/Dockerfile.distroless +++ b/Dockerfile.distroless @@ -28,8 +28,6 @@ ARG BUILD_TIMESTAMP WORKDIR /tinyauth -COPY ./paerser ./paerser - COPY go.mod ./ COPY go.sum ./