Skip to content

Commit

Permalink
Merge branch 'release/2024.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
torikizi committed Sep 9, 2024
2 parents 658da9d + e8c6916 commit 95420fc
Show file tree
Hide file tree
Showing 45 changed files with 283 additions and 1,782 deletions.
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
"group:allNonMajor",
"schedule:weekly"
]
}
}
41 changes: 9 additions & 32 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ name: build

on:
pull_request:
paths-ignore:
- 'doc/**'
- '**.md'
- 'THANKS'
- 'LICENSE'
- 'NOTICE'
push:
branches:
- main
Expand Down Expand Up @@ -37,7 +43,7 @@ jobs:
sudo rm -rf /var/lib/apt/lists/*
env:
DEBIAN_FRONTEND: noninteractive
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get vars
shell: bash
id: vars
Expand Down Expand Up @@ -93,13 +99,6 @@ jobs:
restore-keys: ${{ matrix.os }}-ccache-dir-
- name: Ccache stat
run: ccache -s
- name: Cache ~/.cache/bazel directory
uses: actions/cache@v3
with:
path: "~/.cache/bazel"
key: ${{ matrix.os }}-cache-bazel-dir
- name: Install numpy
run: pip install numpy
- name: Build hisui
run: ./build.bash ${{ matrix.os }} --package --use-ccache ${{ contains(matrix.os, '_x86_64') && '--with-test' || '' }}
timeout-minutes: 120
Expand All @@ -126,12 +125,6 @@ jobs:
name: ${{ matrix.os }}-hisui-binary-${{ steps.vars.outputs.sha_short }}
path: release/${{ matrix.os }}/hisui
if-no-files-found: error
- name: Upload Lyra model_coeffs with hash
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.os }}-lyra-model-coeffs
path: third_party/lyra/lyra/lyra/model_coeffs
if-no-files-found: error
- name: Upload tarball
uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -160,7 +153,7 @@ jobs:
- build-linux
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Mkdir release
shell: bash
run: |
Expand Down Expand Up @@ -191,22 +184,6 @@ jobs:
chmod 755 release/ubuntu-20.04_arm64/hisui
chmod 755 release/ubuntu-22.04_x86_64/hisui
chmod 755 release/ubuntu-22.04_arm64/hisui
- uses: actions/download-artifact@v3
with:
name: ubuntu-20.04_x86_64-lyra-model-coeffs
path: release/ubuntu-20.04_x86_64/lyra/model_coeffs
- uses: actions/download-artifact@v3
with:
name: ubuntu-20.04_arm64-lyra-model-coeffs
path: release/ubuntu-20.04_arm64/lyra/model_coeffs
- uses: actions/download-artifact@v3
with:
name: ubuntu-22.04_x86_64-lyra-model-coeffs
path: release/ubuntu-22.04_x86_64/lyra/model_coeffs
- uses: actions/download-artifact@v3
with:
name: ubuntu-22.04_arm64-lyra-model-coeffs
path: release/ubuntu-22.04_arm64/lyra/model_coeffs
- name: Get Versions
shell: bash
id: versions
Expand Down Expand Up @@ -256,7 +233,7 @@ jobs:
- build-linux
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/download
with:
platform: ubuntu-20.04_x86_64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
pip3 install --user cpplint
env:
DEBIAN_FRONTEND: noninteractive
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Lint hisui
run: PATH=$PATH:~/.local/bin:~/go/bin ./lint.bash
timeout-minutes: 120
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
/third_party/libvpx
/third_party/lyra/bazel-*
/third_party/lyra/lyra
/third_party/SVT-AV1
/test/integration/input/caminandes3.webm
/test/integration/input/lilac_blossom_bloom_spring.jpg
Expand Down
Loading

0 comments on commit 95420fc

Please sign in to comment.