ci: finalize merged ci files

for merging. renamed to unstable and stable, removed the -docker files,
    and modified the stable one too.
This commit is contained in:
Harvey Tindall
2025-12-01 16:31:13 +00:00
parent 550cb36bd1
commit 861e72b331
4 changed files with 56 additions and 103 deletions
-37
View File
@@ -1,37 +0,0 @@
when:
- event: push
branch: main
clone:
git:
image: woodpeckerci/plugin-git
settings:
tags: true
partial: false
depth: 0
steps:
- name: build
image: docker.io/woodpeckerci/plugin-docker-buildx
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:
from_secret: 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
-37
View File
@@ -1,37 +0,0 @@
when:
- event: tag
branch: main
clone:
git:
image: woodpeckerci/plugin-git
settings:
tags: true
partial: false
depth: 0
steps:
- name: build
image: docker.io/woodpeckerci/plugin-docker-buildx
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:
from_secret: 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
@@ -51,6 +51,31 @@ steps:
- bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "repo-process-deb trusty"' - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "repo-process-deb trusty"'
- bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "repo-process-deb trusty-unstable"' - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "repo-process-deb trusty-unstable"'
- bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "rm -f /repo/incoming/*.deb"' - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "rm -f /repo/incoming/*.deb"'
- name: build-external
image: docker.io/hrfee/jfa-go-build-docker:latest
environment:
JFA_GO_BUILT_BY:
from_secret: BUILT_BY
commands:
- sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' ./build/data/html/setup.html
- env GOOS=linux INTERNAL=off ./scripts/version.sh ./goreleaser build --id notray-e2ee --clean
- mv ./dist/notray-e2ee_linux_arm_6 ./dist/notray-e2ee_linux_arm
- name: container
image: docker.io/woodpeckerci/plugin-docker-buildx
settings:
dry_run: false
dockerfile: Dockerfile.ci
username:
from_secret: DOCKER_USERNAME
password:
from_secret: DOCKER_TOKEN
repo: docker.io/hrfee/jfa-go
tags: stable
registry: docker.io
platforms: linux/amd64,linux/arm64,linux/arm/v7
build_args:
- BUILT_BY:
from_secret: BUILT_BY
- name: buildrone - name: buildrone
image: docker.io/hrfee/jfa-go-build-docker:latest image: docker.io/hrfee/jfa-go-build-docker:latest
environment: environment:
@@ -59,3 +84,4 @@ steps:
commands: commands:
- wget https://builds.hrfee.pw/upload.py - wget https://builds.hrfee.pw/upload.py
- bash -c 'python3 upload.py https://builds.hrfee.pw hrfee jfa-go --tag internal=true' - bash -c 'python3 upload.py https://builds.hrfee.pw hrfee jfa-go --tag internal=true'
- python upload.py https://builds.hrfee.pw hrfee jfa-go --tag docker-stable=true
@@ -1,6 +1,6 @@
when: when:
- event: push - event: push
branch: ci-streamline branch: main
# - evaluate: 'CI_PIPELINE_EVENT != "PULL_REQUEST" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH' # - evaluate: 'CI_PIPELINE_EVENT != "PULL_REQUEST" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH'
clone: clone:
@@ -40,33 +40,25 @@ steps:
- curl -sfL https://goreleaser.com/static/run > goreleaser - curl -sfL https://goreleaser.com/static/run > goreleaser
- chmod +x goreleaser - chmod +x goreleaser
- ./scripts/version.sh ./goreleaser --snapshot --skip=publish --clean - ./scripts/version.sh ./goreleaser --snapshot --skip=publish --clean
# - name: redoc - name: redoc
# image: docker.io/hrfee/jfa-go-build-docker:latest image: docker.io/hrfee/jfa-go-build-docker:latest
# environment: environment:
# REDOC_SSH_ID: REDOC_SSH_ID:
# from_secret: REDOC_SSH_ID from_secret: REDOC_SSH_ID
# commands: commands:
# - sh -c "echo \"$REDOC_SSH_ID\" > /tmp/id_redoc && chmod 600 /tmp/id_redoc" - 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"' - 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: deb-repo - name: deb-repo
# image: docker.io/hrfee/jfa-go-build-docker:latest image: docker.io/hrfee/jfa-go-build-docker:latest
# environment: environment:
# REPO_SSH_ID: REPO_SSH_ID:
# from_secret: REPO_SSH_ID from_secret: REPO_SSH_ID
# commands: commands:
# - sh -c "echo \"$REPO_SSH_ID\" > /tmp/id_repo && chmod 600 /tmp/id_repo" - 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@apt.hrfee.dev:/repo/incoming <<< $"put dist/*.deb"' - bash -c 'sftp -P 2022 -i /tmp/id_repo -o StrictHostKeyChecking=no root@apt.hrfee.dev:/repo/incoming <<< $"put dist/*.deb"'
# - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "repo-process-deb trusty-unstable"' - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "repo-process-deb trusty-unstable"'
# - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "repo-process-deb trusty"' - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "repo-process-deb trusty"'
# - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "rm -f /repo/incoming/*.deb"' - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -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'
- name: build-external - name: build-external
image: docker.io/hrfee/jfa-go-build-docker:latest image: docker.io/hrfee/jfa-go-build-docker:latest
environment: environment:
@@ -87,11 +79,20 @@ steps:
password: password:
from_secret: DOCKER_TOKEN from_secret: DOCKER_TOKEN
repo: docker.io/hrfee/jfa-go repo: docker.io/hrfee/jfa-go
tags: debug-ci-streamline tags: unstable
registry: docker.io registry: docker.io
platforms: linux/amd64,linux/arm64,linux/arm/v7 platforms: linux/amd64,linux/arm64,linux/arm/v7
build_args: build_args:
- BUILT_BY: - BUILT_BY:
from_secret: BUILT_BY from_secret: BUILT_BY
- 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'
- python upload.py https://builds.hrfee.pw hrfee jfa-go --tag docker-unstable=true