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"
schedule:
interval: "weekly"
assignees:
- "Fijxu"
- package-ecosystem: github-actions
directory: /
schedule:
interval: "weekly"
assignees:
- "Fijxu"
- package-ecosystem: "nix"
directory: /nix
schedule:
interval: "weekly"
assignees:
- "Fijxu"

View File

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

View File

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

View File

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

View File

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

6
nix/flake.lock generated
View File

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