.goreleaser.yml

@@ -80,9 +80,6 @@ builds:
       dir: ./
       env:
         - CGO_ENABLED=1
-        - CC=x86_64-linux-gnu-gcc
-        - CXX=x86_64-linux-gnu-gcc
-        - PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH
       flags:
         - -tags=tray
       ldflags:

.woodpecker/git-binary.yaml

@@ -1,48 +0,0 @@
-when:
-  - event: push
-    branch: main
-  #  - evaluate: 'CI_PIPELINE_EVENT != "PULL_REQUEST" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH'
-
-clone:
-    git:
-        image: woodpeckerci/plugin-git
-        settings:
-            tags: true
-
-steps:
-  - name: redoc
-    image: docker.io/hrfee/jfa-go-build-docker:latest
-    environment:
-        REDOC_SSH_ID:
-            from_secret: REDOC_SSH_ID
-    commands:
-      - sh -c "echo \"$REDOC_SSH_ID\" > /tmp/id_redoc && chmod 600 /tmp/id_redoc"
-      - bash -c 'sftp -P 3625 -i /tmp/id_redoc -o StrictHostKeyChecking=no redoc@api.jfa-go.com:/home/redoc <<< $"put docs/swagger.json jfa-go.json"'
-  - name: build
-    image: docker.io/hrfee/jfa-go-build-docker:latest
-    environment:
-        JFA_GO_SNAPSHOT: y
-        JFA_GO_BUILT_BY:
-            from_secret: BUILT_BY
-    commands:
-      - curl -sfL https://goreleaser.com/static/run > goreleaser
-      - chmod +x goreleaser
-      - ./scripts/version.sh ./goreleaser --snapshot --skip=publish --clean
-  - name: deb-repo
-    image: docker.io/hrfee/jfa-go-build-docker:latest
-    environment:
-        REPO_SSH_ID:
-            from_secret: REPO_SSH_ID
-    commands:
-      - sh -c "echo \"$REPO_SSH_ID\" > /tmp/id_repo && chmod 600 /tmp/id_repo"
-      - bash -c 'sftp -P 2022 -i /tmp/id_repo -o StrictHostKeyChecking=no root@161.97.102.153:/repo/incoming <<< $"put dist/*.deb"'
-      - bash -c 'ssh -i /tmp/id_repo root@161.97.102.153 -p 2022 "repo-process-deb trusty"'
-      - bash -c 'ssh -i /tmp/id_repo root@161.97.102.153 -p 2022 "rm -f /repo/incoming/*.deb"'
-  - name: buildrone
-    image: docker.io/hrfee/jfa-go-build-docker:latest
-    environment:
-        BUILDRONE_KEY:
-            from_secret: BUILDRONE_KEY
-    commands:
-      - wget https://builds.hrfee.pw/upload.py
-      - bash -c 'python3 upload.py https://builds.hrfee.pw hrfee jfa-go --upload ./dist/*.zip ./dist/*.rpm ./dist/*.apk --tag internal-git=true'

.woodpecker/git-docker.yaml

@@ -1,29 +0,0 @@
-when:
-  - event: push
-    branch: main
-
-steps:
-  - name: build
-    image: docker.io/woodpeckerci/plugin-docker-buildx
-    secrets: [ BUILT_BY ]
-    settings:
-        username:
-            from_secret: DOCKER_USERNAME
-        password:
-            from_secret: DOCKER_TOKEN
-        repo: docker.io/hrfee/jfa-go
-        tags: unstable
-        registry: docker.io
-        platforms: linux/amd64,linux/arm64,linux/arm/v7
-        build_args:
-          - BUILT_BY: $BUILT_BY
-  - name: buildrone
-    image: docker.io/python
-    environment:
-        BUILDRONE_KEY:
-            from_secret: BUILDRONE_KEY
-    commands:
-      - wget https://builds.hrfee.pw/upload.py
-      - pip install requests
-      - python upload.py https://builds.hrfee.pw hrfee jfa-go --tag docker-unstable=true
-

.woodpecker/stable-binary.yaml

@@ -1,32 +0,0 @@
-when:
-  - event: tag
-    branch: main
-
-steps:
-  - name: build
-    image: docker.io/hrfee/jfa-go-build-docker:latest
-    environment:
-        JFA_GO_BUILT_BY:
-            from_secret: BUILT_BY
-    commands:
-      - curl -sfL https://goreleaser.com/static/run > ../goreleaser
-      - chmod +x ../goreleaser
-      - ./scripts/version.sh ../goreleaser
-  - name: deb-repo
-    image: docker.io/hrfee/jfa-go-build-docker:latest
-    environment:
-        REPO_SSH_ID:
-            from_secret: REPO_SSH_ID
-    commands:
-      - sh -c "echo \"$REPO_SSH_ID\" > /tmp/id_repo && chmod 600 /tmp/id_repo"
-      - bash -c 'sftp -P 2022 -i /tmp/id_repo -o StrictHostKeyChecking=no root@161.97.102.153:/repo/incoming <<< $"put dist/*.deb"'
-      - bash -c 'ssh -i /tmp/id_repo root@161.97.102.153 -p 2022 "repo-process-deb trusty"'
-      - bash -c 'ssh -i /tmp/id_repo root@161.97.102.153 -p 2022 "rm -f /repo/incoming/*.deb"'
-  - name: buildrone
-    image: docker.io/hrfee/jfa-go-build-docker:latest
-    environment:
-        BUILDRONE_KEY:
-            from_secret: BUILDRONE_KEY
-    commands:
-      - wget https://builds.hrfee.pw/upload.py
-      - bash -c 'python3 upload.py https://builds.hrfee.pw hrfee jfa-go --tag internal=true'

.woodpecker/stable-docker.yaml

@@ -1,29 +0,0 @@
-when:
-  - event: tag
-    branch: main
-
-steps:
-  - name: build
-    image: docker.io/woodpeckerci/plugin-docker-buildx
-    secrets: [ BUILT_BY ]
-    settings:
-        username:
-            from_secret: DOCKER_USERNAME
-        password:
-            from_secret: DOCKER_TOKEN
-        repo: docker.io/hrfee/jfa-go
-        tags: latest
-        registry: docker.io
-        platforms: linux/amd64,linux/arm64,linux/arm/v7
-        build_args:
-          - BUILT_BY: $BUILT_BY
-  - name: buildrone
-    image: docker.io/python
-    environment:
-        BUILDRONE_KEY:
-            from_secret: BUILDRONE_KEY
-    commands:
-      - wget https://builds.hrfee.pw/upload.py
-      - pip install requests
-      - python upload.py https://builds.hrfee.pw hrfee jfa-go --tag docker-stable=true
-

Dockerfile

@@ -1,22 +1,18 @@
-# Use this instead if hrfee/jfa-go-build-docker doesn't support your architecture
+FROM --platform=$BUILDPLATFORM golang:latest AS support
-# FROM --platform=$BUILDPLATFORM golang:latest AS support
-FROM --platform=$BUILDPLATFORM hrfee/jfa-go-build-docker AS support
 
 COPY . /opt/build
 
-# Uncomment this if hrfee/jfa-go-build-docker doesn't support your architecture
+RUN apt-get update -y \
-# RUN apt-get update -y \
+    && apt-get install build-essential python3-pip curl software-properties-common sed -y \
-#     && apt-get install build-essential python3-pip -y \
+    && (curl -sL https://deb.nodesource.com/setup_current.x | bash -) \
-#     && (curl -sL https://deb.nodesource.com/setup_current.x | bash -) \
+    && apt-get install nodejs \
-#     && apt-get install nodejs
+    && (cd /opt/build; make configuration npm email typescript variants-html bundle-css inline-css swagger copy INTERNAL=off GOESBUILD=on) \
-RUN (cd /opt/build; make configuration npm email typescript variants-html bundle-css inline-css swagger copy INTERNAL=off GOESBUILD=on) \
     && sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/build/data/html/setup.html
 
+
 FROM --platform=$BUILDPLATFORM golang:latest AS build
 ARG TARGETARCH
 ENV GOARCH=$TARGETARCH
-ARG BUILT_BY
-ENV BUILTBY=$BUILT_BY
 
 COPY --from=support /opt/build /opt/build