test

.woodpecker/compliance-and-tests.yml

@@ -1,114 +0,0 @@
-platform: linux/amd64
-
-variables:
-  - &golang_image 'golang:1.19'
-  - &gitea_test_env_image 'gitea/test_env:linux-amd64'
-  - &git_image 'docker:git'
-  - &drone_git_image 'drone/git'
-
-workspace:
-  base: /go
-  path: src/codeberg/gitea
-
-pipeline:
-  dummy:
-    image: *golang_image
-    commands:
-      - exit 0
-
-  # deps-backend:
-  #   image: *golang_image
-  #   pull: true
-  #   secrets:
-  #     - goproxy_override
-  #   commands:
-  #   - test "$${GOPROXY_OVERRIDE-}" != "" && export GOPROXY="$${GOPROXY_OVERRIDE}"
-  #   - make deps-backend
-
-  # security-check:
-  #   image: *golang_image
-  #   pull: true
-  #   secrets:
-  #     - goproxy_override
-  #   commands:
-  #   - test "$${GOPROXY_OVERRIDE-}" != "" && export GOPROXY="$${GOPROXY_OVERRIDE}"
-  #   - make security-check
-
-  # lint-backend:
-  #   image: *gitea_test_env_image
-  #   pull: true
-  #   secrets:
-  #     - goproxy_override
-  #   environment:
-  #   - TAGS=bindata sqlite sqlite_unlock_notify
-  #   - GOSUMDB=sum.golang.org
-  #   commands:
-  #   - test "$${GOPROXY_OVERRIDE-}" != "" && export GOPROXY="$${GOPROXY_OVERRIDE}"
-  #   - make lint-backend
-
-  # checks-backend:
-  #   image: *golang_image
-  #   pull: true
-  #   secrets:
-  #     - goproxy_override
-  #   commands:
-  #   - test "$${GOPROXY_OVERRIDE-}" != "" && export GOPROXY="$${GOPROXY_OVERRIDE}"
-  #   - make --always-make checks-backend
-
-  # fetch-tags:
-  #   image: *git_image
-  #   pull: true
-  #   commands:
-  #   - git config --add safe.directory '*'
-  #   - git fetch --tags --force
-
-  # tag-pre-condition:
-  #   image: *drone_git_image
-  #   pull: true
-  #   commands:
-  #   - git update-ref refs/heads/tag_test ${CI_COMMIT_SHA}
-
-  # prepare-test-env:
-  #   image: *gitea_test_env_image
-  #   pull: true
-  #   secrets:
-  #     - goproxy_override
-  #   commands:
-  #   - test "$${GOPROXY_OVERRIDE-}" != "" && export GOPROXY="$${GOPROXY_OVERRIDE}"
-  #   - ./build/test-env-prepare.sh
-
-  # build-test:
-  #   image: *gitea_test_env_image
-  #   pull: true
-  #   secrets:
-  #     - goproxy_override
-  #   environment:
-  #   - GOSUMDB=sum.golang.org
-  #   - TAGS=bindata sqlite sqlite_unlock_notify
-  #   commands:
-  #   - test "$${GOPROXY_OVERRIDE-}" != "" && export GOPROXY="$${GOPROXY_OVERRIDE}"
-  #   - su gitea -c './build/test-env-check.sh'
-  #   - su gitea -c 'make backend'
-
-  # unit-test:
-  #   image: *gitea_test_env_image
-  #   pull: true
-  #   secrets:
-  #     - github_read_token
-  #     - goproxy_override
-  #   environment:
-  #   - TAGS=bindata sqlite sqlite_unlock_notify
-  #   - RACE_ENABLED=true
-  #   commands:
-  #   - test "$${GOPROXY_OVERRIDE-}" != "" && export GOPROXY="$${GOPROXY_OVERRIDE}"
-  #   - su gitea -c 'make unit-test-coverage test-check'
-
-  # test-sqlite:
-  #   image: *gitea_test_env_image
-  #   environment:
-  #   - USE_REPO_TEST_DIR=1
-  #   - GOPROXY=off
-  #   - TAGS=bindata gogit sqlite sqlite_unlock_notify
-  #   - TEST_TAGS=bindata gogit sqlite sqlite_unlock_notify
-  #   commands:
-  #   - su gitea -c 'timeout -s ABRT 120m make test-sqlite-migration test-sqlite'

.woodpecker/release-version.yml

@@ -1,7 +1,7 @@
 platform: linux/amd64
 
-depends_on:
-  - compliance-and-tests
+# depends_on:
+#   - compliance-and-tests
 
 workspace:
   base: /source
@@ -23,44 +23,44 @@ variables:
   - &docker_platforms 'linux/amd64,linux/arm64'
 
 pipeline:
-  fetch-tags:
-    image: *git_image
-    pull: true
-    commands:
-     - git config --add safe.directory '*'
-     - git fetch --tags --force
+  # fetch-tags:
+  #   image: *git_image
+  #   pull: true
+  #   commands:
+  #    - git config --add safe.directory '*'
+  #    - git fetch --tags --force
 
-  deps-frontend:
-    image: *node_image
-    pull: true
-    commands:
-      - make deps-frontend
+  # deps-frontend:
+  #   image: *node_image
+  #   pull: true
+  #   commands:
+  #     - make deps-frontend
 
-  deps-backend:
-    image: *golang_image
-    pull: true
-    commands:
-      - test "$${GOPROXY_OVERRIDE-}" != "" && export GOPROXY="$${GOPROXY_OVERRIDE}"
-      - make deps-backend
-    secrets:
-      - goproxy_override
+  # deps-backend:
+  #   image: *golang_image
+  #   pull: true
+  #   commands:
+  #     - test "$${GOPROXY_OVERRIDE-}" != "" && export GOPROXY="$${GOPROXY_OVERRIDE}"
+  #     - make deps-backend
+  #   secrets:
+  #     - goproxy_override
 
-  build-static:
-    image: *xgo_image
-    pull: true
-    commands:
-      - test "$${GOPROXY_OVERRIDE-}" != "" && export GOPROXY="$${GOPROXY_OVERRIDE}"
-      - echo "installing nodejs"
-      - curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get -qqy install nodejs
-      - export PATH=$PATH:$GOPATH/bin
-      - echo "building forgejo"
-      - make CI=true LINUX_ARCHS=$${LINUX_ARCHS} release
-    environment:
-      TAGS: bindata sqlite sqlite_unlock_notify
-      DEBIAN_FRONTEND: noninteractive
-      LINUX_ARCHS: *make_platforms
-    secrets:
-      - goproxy_override
+  # build-static:
+  #   image: *xgo_image
+  #   pull: true
+  #   commands:
+  #     - test "$${GOPROXY_OVERRIDE-}" != "" && export GOPROXY="$${GOPROXY_OVERRIDE}"
+  #     - echo "installing nodejs"
+  #     - curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get -qqy install nodejs
+  #     - export PATH=$PATH:$GOPATH/bin
+  #     - echo "building forgejo"
+  #     - make CI=true LINUX_ARCHS=$${LINUX_ARCHS} release
+  #   environment:
+  #     TAGS: bindata sqlite sqlite_unlock_notify
+  #     DEBIAN_FRONTEND: noninteractive
+  #     LINUX_ARCHS: *make_platforms
+  #   secrets:
+  #     - goproxy_override
 
   # gpg-sign:
   #   image: *gpgsign_plugin_image
@@ -97,14 +97,18 @@ pipeline:
     image: *golang_image
     pull: true
     commands:
-     - ls -la ./*
+     - env | grep -vi drone | sort -h
+     - mkdir -p /source/dist/release
+     - touch /source/dist/release/forgejo-${CI_COMMIT_TAG##v}-linux-arm64
+     - touch /source/dist/release/forgejo-${CI_COMMIT_TAG##v}-linux-amd64
+     - mkdir tmp-bin
+     - cp -r dist/* tmp-bin/
 
   build-docker:
     image: *buildx_plugin_image
     pull: true
     settings:
       dockerfile: Dockerfile.ci
-      no_cache: true
       platforms: *docker_platforms
       registry:
         from_secret: domain
@@ -113,11 +117,11 @@ pipeline:
       build_args:
        - TAG=${CI_COMMIT_TAG##v}
       build_args_from_env:
-       - CI_COMMIT_TAG
        - CI_REPO_CLONE_URL
+       - CI_COMMIT_SHA
       password:
         from_secret: releaseteamtoken
       username:
         from_secret: releaseteamuser
-    when:
-      event: tag
+    # when:
+    #   event: tag

Dockerfile.ci

@@ -1,30 +1,39 @@
-FROM --platform=$BUILDPLATFORM codeberg.org/forgejo/golang:1.19-alpine3.17 AS build-env
+FROM --platform=$BUILDPLATFORM golang:1.19 AS build-env
 ARG BUILDPLATFORM
 
 ARG GOPROXY
-ENV GOPROXY ${GOPROXY:-direct}
+ENV GOPROXY "${GOPROXY:-direct}"
 
-ARG TAG main
+ARG TAG
+ENV TAG ${TAG:-main}
 
 ARG CI_COMMIT_SHA
+ENV CI_COMMIT_SHA "${CI_COMMIT_SHA}"
+
 ARG CI_REPO_CLONE_URL
+ENV CI_REPO_CLONE_URL "${CI_REPO_CLONE_URL}"
 
 # Shorthands for easy use and ease of replacement
-ARG OUT "/out-bins"
-ARG DR "/docker/root"
+ARG OUT
+ENV OUT "${OUT:-/out-bins}"
+ARG DR
+ENV DR "${DR:-"/docker/root"}"
 
 # Check vars and create directories
 RUN test -n "$CI_COMMIT_SHA" || (echo "CI_COMMIT_SHA is required but not set" >&2 && exit 1) && \
   test -n "$CI_REPO_CLONE_URL" || (echo "CI_REPO_CLONE_URL is required but not set" >&2 && exit 1) && \
   echo "Running prep for ${CI_REPO_CLONE_URL} commit ${CI_COMMIT_SHA}" && \
+  echo "Preparin out directories ${OUT}" && \
   mkdir -p "${OUT}/linux/amd64" && \
   mkdir -p "${OUT}/linux/arm64" && \
+  echo "Creating build dir" && \
   mkdir /build && \
+  echo "Creating docker root prep dir ${DR}" && \
   mkdir -p "${DR}"
 
 # Copying the arch specific binaries to the path easily accessible in the next step and rename them to gitea
-COPY --chmod=755 ./dist/release/forgejo-$TAG-linux-amd64 "${OUT}/linux/amd64/gitea"
-COPY --chmod=755 ./dist/release/forgejo-$TAG-linux-arm64 "${OUT}/linux/arm64/gitea"
+COPY --chmod=755 tmp-bin/release/forgejo-$TAG-linux-amd64 "${OUT}/linux/amd64/gitea"
+COPY --chmod=755 tmp-bin/release/forgejo-$TAG-linux-arm64 "${OUT}/linux/arm64/gitea"
 
 WORKDIR /build
 
@@ -40,24 +49,25 @@ RUN  echo "setting up git" && \
   export ENV2INI="environment-to-ini" && \
   export GOFILE="contrib/$ENV2INI/$ENV2INI.go" && \
   echo "compiling for linux/amd64" && \
-  GOOS=linux GOARCH=amd64 go build -o "${OUT}/linux/amd64/$ENV2INI" "${GOFILE}" && \
+  bash -c 'GOOS=linux GOARCH=amd64 go build -o "${OUT}/linux/amd64/$ENV2INI" "${GOFILE}"' && \
   echo "compiling for linux/arm64" && \
-  GOOS=linux GOARCH=arm64 go build -o "${OUT}/linux/arm64/$ENV2INI "${GOFILE}" && \
+  bash -c 'GOOS=linux GOARCH=arm64 go build -o "${OUT}/linux/arm64/$ENV2INI "${GOFILE}"' && \
   cd / && \
   echo "Copying future root addons" && \
   cp -r /build"${DR}/* "${DR}/ && \
   echo "Fixing permissions" && \
   chmod 755 "${DR}/usr/bin/entrypoint "${DR}/usr/local/bin/gitea "${DR}/etc/s6/gitea/* "${DR}/etc/s6/openssh/* "${DR}/etc/s6/.s6-svscan/* && \
   echo "removing git repo" && \
-  rm -Rf /build
+  rm -Rf /build && \
+  echo "removing go cached files" && \
+  rm -Rf "$(go env GOCACHE)" && \
+  rm -Rf "$(go env GOROOT)/pkg" && \
+  rm -Rf "$(go env GOPATH)/pkg"
 
 # Main build
-FROM codeberg.org/forgejo/alpine:3.17.0
+FROM alpine:3.17.0
 LABEL maintainer="contact@forgejo.org"
 
-ARG TARGETPLATFORM
-ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
-
 EXPOSE 22 3000
 
 RUN apk --no-cache add \
@@ -94,8 +104,14 @@ VOLUME ["/data"]
 ENTRYPOINT ["/usr/bin/entrypoint"]
 CMD ["/bin/s6-svscan", "/etc/s6"]
 
-ARG OUT "/out-bins"
-ARG DR "/docker/root"
+ARG TARGETPLATFORM
+ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
+
+# Shorthands for easy use and ease of replacement
+ARG OUT
+ENV OUT "${OUT:-/out-bins}"
+ARG DR
+ENV DR "${DR:-"/docker/root"}"
 
 COPY --from=build-env "${DR}" /
 COPY --from=build-env --chmod=755 "${OUT}/$TARGETPLATFORM/*" /app/gitea/