Merge remote-tracking branch 'refs/remotes/upstream/master' into fix-carousel-header-work

This commit is contained in:
EazyHood 2026-09-02 10:44:05 -05:00
commit f11ced5a02
6 changed files with 21 additions and 15 deletions

View File

@ -4,11 +4,17 @@ updates:
directory: "/docker" directory: "/docker"
schedule: schedule:
interval: "weekly" interval: "weekly"
assignees:
- "Fijxu"
- package-ecosystem: github-actions - package-ecosystem: github-actions
directory: / directory: /
schedule: schedule:
interval: "weekly" interval: "weekly"
assignees:
- "Fijxu"
- package-ecosystem: "nix" - package-ecosystem: "nix"
directory: /nix directory: /nix
schedule: schedule:
interval: "weekly" interval: "weekly"
assignees:
- "Fijxu"

View File

@ -15,8 +15,8 @@ on:
- .github/ISSUE_TEMPLATE/* - .github/ISSUE_TEMPLATE/*
- kubernetes/** - kubernetes/**
# Nix development files that are not used here. # Nix development files that are not used here.
- "*.nix" - .envrc
- flake.lock - "nix/**"
jobs: jobs:
release: release:
@ -39,7 +39,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v7
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v4 uses: docker/setup-buildx-action@v4
@ -89,7 +89,7 @@ jobs:
# https://github.com/marketplace/actions/docker-manifest-create-action # https://github.com/marketplace/actions/docker-manifest-create-action
- name: Create and push manifest - name: Create and push manifest
uses: int128/docker-manifest-create-action@v2.26.0 uses: int128/docker-manifest-create-action@v2
with: with:
push: true push: true
tags: quay.io/invidious/invidious:master tags: quay.io/invidious/invidious:master

View File

@ -27,7 +27,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v7
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v4 uses: docker/setup-buildx-action@v4
@ -78,7 +78,7 @@ jobs:
# https://github.com/marketplace/actions/docker-manifest-create-action # https://github.com/marketplace/actions/docker-manifest-create-action
- name: Create and push manifest - name: Create and push manifest
uses: int128/docker-manifest-create-action@v2.26.0 uses: int128/docker-manifest-create-action@v2
with: with:
push: true push: true
tags: quay.io/invidious/invidious:latest tags: quay.io/invidious/invidious:latest

View File

@ -25,8 +25,8 @@ on:
- kubernetes/** - kubernetes/**
# Nix development files that are not used here. # Nix development files that are not used here.
- "*.nix" - .envrc
- flake.flake - "nix/**"
jobs: jobs:
build: build:
@ -55,7 +55,7 @@ jobs:
stable: false stable: false
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v7
with: with:
submodules: true submodules: true
@ -103,7 +103,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v7
- name: Build Docker - name: Build Docker
run: docker compose build run: docker compose build
@ -131,7 +131,7 @@ jobs:
continue-on-error: true continue-on-error: true
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v7
with: with:
submodules: true submodules: true

View File

@ -38,7 +38,7 @@ jobs:
prepare-release: prepare-release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v7
with: with:
ref: master ref: master
fetch-depth: 0 fetch-depth: 0

6
nix/flake.lock generated
View File

@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1786599213, "lastModified": 1787498568,
"narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=", "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4", "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188",
"type": "github" "type": "github"
}, },
"original": { "original": {