Skip to content

Commit

Permalink
Merge pull request #1329 from runtipi/release/3.1.1
Browse files Browse the repository at this point in the history
Release/3.1.1
  • Loading branch information
meienberger committed Mar 24, 2024
2 parents 735a9d3 + f811cc0 commit 95d50c0
Show file tree
Hide file tree
Showing 87 changed files with 3,664 additions and 3,651 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Expand Up @@ -15,3 +15,4 @@
!public/**
!src/**
!tests/**
!start.*.sh
4 changes: 2 additions & 2 deletions .env.example
Expand Up @@ -11,12 +11,12 @@ STORAGE_PATH=/path/to/runtipi
NGINX_PORT=7000
NGINX_PORT_SSL=443
DOMAIN=tipi.localhost
POSTGRES_HOST=tipi-db
POSTGRES_HOST=runtipi-db
POSTGRES_DBNAME=tipi
POSTGRES_USERNAME=tipi
POSTGRES_PASSWORD=postgres
POSTGRES_PORT=5432
REDIS_HOST=tipi-redis
REDIS_HOST=runtipi-redis
REDIS_PASSWORD=redis
DEMO_MODE=false
LOCAL_DOMAIN=tipi.lan
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Expand Up @@ -13,6 +13,7 @@ Before opening your issue be sure to have completed all those tasks.
- [ ] My issue is not a support request (eg: "My instance is not running after update". If so please ask for support in the help section of our [Discord server](https://discord.gg/gyeHhmvwaK))
- [ ] I have searched for an already existing issue with similar context and errors. My issue has not yet been reported.
- [ ] I have included a clear description and steps to reproduce.
- [ ] I have included the result of the command `./runtipi-cli debug`
- [ ] I have included logs from the file `runtipi/logs/error.log` if relevant

**Describe the bug**
Expand Down
15 changes: 7 additions & 8 deletions .github/dependabot.yml
@@ -1,20 +1,19 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: 'npm'
directory: '/'
versioning-strategy: increase
schedule:
interval: 'daily'
open-pull-requests-limit: 10
rebase-strategy: 'auto'

groups:
minor-patch:
update-types:
- minor
- patch

- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'daily'
rebase-strategy: 'auto'
rebase-strategy: 'auto'
38 changes: 2 additions & 36 deletions .github/workflows/alpha-release.yml
Expand Up @@ -26,40 +26,6 @@ jobs:
with:
tag: ${{ steps.get_tag.outputs.tagname }}

build-worker:
runs-on: ubuntu-latest
needs: create-tag
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push images
uses: docker/build-push-action@v5
with:
context: .
build-args: |
SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
TIPI_VERSION=${{ needs.create-tag.outputs.tagname }}
file: ./packages/worker/Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/${{ github.repository_owner }}/worker:${{ needs.create-tag.outputs.tagname }}
cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/worker:buildcache
cache-to: type=registry,ref=ghcr.io/${{ github.repository_owner }}/worker:buildcache,mode=max

build-images:
runs-on: ubuntu-latest
needs: create-tag
Expand Down Expand Up @@ -147,7 +113,7 @@ jobs:

create-release:
runs-on: ubuntu-latest
needs: [build-worker, build-images, build-cli, create-tag]
needs: [build-images, build-cli, create-tag]
steps:
- name: Download CLI
uses: actions/download-artifact@v4
Expand All @@ -160,7 +126,7 @@ jobs:

- name: Create alpha release
id: create_release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
52 changes: 16 additions & 36 deletions .github/workflows/beta-release.yml
Expand Up @@ -26,40 +26,6 @@ jobs:
with:
tag: ${{ steps.get_tag.outputs.tagname }}

build-worker:
runs-on: ubuntu-latest
needs: create-tag
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push images
uses: docker/build-push-action@v5
with:
build-args: |
SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
TIPI_VERSION=${{ needs.create-tag.outputs.tagname }}
context: .
file: ./packages/worker/Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/${{ github.repository_owner }}/worker:${{ needs.create-tag.outputs.tagname }}
cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/worker:buildcache
cache-to: type=registry,ref=ghcr.io/${{ github.repository_owner }}/worker:buildcache,mode=max

build-images:
needs: create-tag
runs-on: ubuntu-latest
Expand Down Expand Up @@ -145,9 +111,23 @@ jobs:
name: cli
path: bin

build-pi-image:
runs-on: ubuntu-latest
needs: create-tag
steps:
- name: Dispatch the release action
uses: codex-/return-dispatch@v1
with:
token: ${{ secrets.PAT_CLI }}
ref: main
repo: raspberrypi
owner: runtipi
workflow: beta-release.yml
workflow_inputs: '{ "version": "${{ needs.create-tag.outputs.tagname }}" }'

publish-release:
runs-on: ubuntu-latest
needs: [create-tag, build-images, build-cli, build-worker]
needs: [create-tag, build-images, build-cli]
outputs:
id: ${{ steps.create_release.outputs.id }}
steps:
Expand All @@ -159,7 +139,7 @@ jobs:

- name: Create beta release
id: create_release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Expand Up @@ -106,7 +106,7 @@ jobs:
echo "postgres_password=$postgres_password" >> $GITHUB_OUTPUT
e2e:
timeout-minutes: 30
timeout-minutes: 60
runs-on: ubuntu-latest
needs: [deploy]
steps:
Expand Down
35 changes: 1 addition & 34 deletions .github/workflows/nightly-release.yml
Expand Up @@ -6,39 +6,6 @@ on:
- cron: '0 0 * * *'

jobs:
build-worker:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push images
uses: docker/build-push-action@v5
with:
context: .
build-args: |
SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
TIPI_VERSION=nightly
file: ./packages/worker/Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/${{ github.repository_owner }}/worker:nightly
cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/worker:buildcache
cache-to: type=registry,ref=ghcr.io/${{ github.repository_owner }}/worker:buildcache,mode=max

build-images:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -123,7 +90,7 @@ jobs:

update-release:
runs-on: ubuntu-latest
needs: [build-worker, build-images, build-cli]
needs: [build-images, build-cli]
steps:
- name: Download CLI
uses: actions/download-artifact@v4
Expand Down
53 changes: 16 additions & 37 deletions .github/workflows/release.yml
Expand Up @@ -55,41 +55,6 @@ jobs:
cache-from: type=gha
cache-to: type=gha,mode=max

build-worker:
runs-on: ubuntu-latest
if: github.repository == 'runtipi/runtipi'
needs: create-tag
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push images
uses: docker/build-push-action@v5
with:
context: .
build-args: |
SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
TIPI_VERSION=${{ needs.create-tag.outputs.tagname }}
file: ./packages/worker/Dockerfile
platforms: linux/amd64,linux/arm64
push: true
tags: ghcr.io/${{ github.repository_owner }}/worker:${{ needs.create-tag.outputs.tagname }},ghcr.io/${{ github.repository_owner }}/worker:latest
cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/worker:buildcache
cache-to: type=registry,ref=ghcr.io/${{ github.repository_owner }}/worker:buildcache,mode=max

build-cli:
runs-on: ubuntu-latest
needs: create-tag
Expand Down Expand Up @@ -142,9 +107,23 @@ jobs:
name: cli
path: bin

build-pi-image:
runs-on: ubuntu-latest
needs: create-tag
steps:
- name: Dispatch the release action
uses: codex-/return-dispatch@v1
with:
token: ${{ secrets.PAT_CLI }}
ref: main
repo: raspberrypi
owner: runtipi
workflow: release.yml
workflow_inputs: '{ "version": "${{ needs.create-tag.outputs.tagname }}" }'

publish-release:
runs-on: ubuntu-latest
needs: [create-tag, build-images, build-worker, build-cli]
needs: [create-tag, build-images, build-cli]
outputs:
id: ${{ steps.create_release.outputs.id }}
steps:
Expand All @@ -156,7 +135,7 @@ jobs:

- name: Create release
id: create_release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down

0 comments on commit 95d50c0

Please sign in to comment.