Skip to content

Commit

Permalink
Merge branch 'master' into feature/show-error
Browse files Browse the repository at this point in the history
  • Loading branch information
trim21 authored Dec 17, 2023
2 parents ace6666 + d114335 commit d5f9573
Show file tree
Hide file tree
Showing 88 changed files with 8,964 additions and 19,270 deletions.
2 changes: 0 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
"plugins": [
["@babel/plugin-proposal-decorators", {"legacy": true}],
["@babel/plugin-proposal-class-properties", {"loose": false}],
"@babel/proposal-object-rest-spread",
"@babel/plugin-proposal-optional-chaining",
"@emotion/babel-plugin"
]
}
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,17 @@ jobs:

strategy:
matrix:
node: [14, 16]
node: [18, 20]
fail-fast: false

steps:
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: 'npm'

- run: npm ci
- run: npm run build
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [16]
node: [20]
check: [check-source-formatting, check-types, lint]

steps:
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: npm

- run: npm ci
- run: npm run ${{ matrix.check }}
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
4 changes: 2 additions & 2 deletions .github/workflows/distribute-archlinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
sed -i 's/to-be-determined@tbd/[email protected]/' ./distribution/archlinux/flood/PKGBUILD
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

- name: Publish to AUR
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
build-args: |
AUR_FOLDER=./flood
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/distribute-debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ jobs:

strategy:
matrix:
node: [16]
node: [20]

steps:
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
registry-url: 'https://registry.npmjs.org'
cache: npm

- name: Set up QEMU
run: |
Expand Down
65 changes: 30 additions & 35 deletions .github/workflows/publish-rolling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,17 @@ jobs:

strategy:
matrix:
node: [16]
node: [20]

steps:
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
registry-url: 'https://registry.npmjs.org'
cache: npm

- run: npm ci

Expand All @@ -33,9 +34,9 @@ jobs:
npm version --no-git-tag-version $build_version
echo ::set-output name=BUILD_VERSION::$build_version
- name: Use @${{ github.actor }} scope
- name: Use @jesec scope
run: |
jq '.name = "@${{ github.actor }}/flood"' package.json > package.new.json
jq '.name = "@jesec/flood"' package.json > package.new.json
mv package.new.json package.json
- run: npm pack
Expand Down Expand Up @@ -69,15 +70,13 @@ jobs:
- uses: actions/checkout@v3

- name: Set up QEMU
run: |
sudo apt update
sudo apt install --reinstall -y qemu-user-static
uses: docker/setup-qemu-action@v2

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

- name: Login to DockerHub
uses: docker/login-action@v1
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand All @@ -88,11 +87,11 @@ jobs:
echo ::set-output name=BUILD_VERSION::0.0.0-master.`git rev-parse --short HEAD`
- name: Publish flood:master to Docker Hub
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: .
file: ./distribution/containers/Dockerfile.release
platforms: linux/amd64,linux/arm64,linux/arm/v7
platforms: linux/amd64,linux/arm64
push: true
tags: jesec/flood:master
build-args: |
Expand All @@ -102,7 +101,7 @@ jobs:
- run: sleep 10

- name: Publish rtorrent-flood to Docker Hub
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: .
file: ./distribution/containers/Dockerfile.rtorrent
Expand All @@ -120,27 +119,26 @@ jobs:

strategy:
matrix:
node: [16]
node: [20]

steps:
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
registry-url: 'https://registry.npmjs.org'
cache: npm

- name: Set up QEMU
run: |
sudo apt update
sudo apt install --reinstall -y qemu-user-static
uses: docker/setup-qemu-action@v2

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

- name: Login to DockerHub
uses: docker/login-action@v1
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand All @@ -152,7 +150,7 @@ jobs:
npm version --no-git-tag-version 0.0.0-master.`git rev-parse --short HEAD`
- name: Publish flood:master-dbg to Docker Hub
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: .
file: ./Dockerfile
Expand All @@ -162,7 +160,7 @@ jobs:
tags: jesec/flood:master-dbg

- name: Publish rtorrent-flood:master-dbg to Docker Hub
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: .
file: ./Dockerfile
Expand All @@ -177,11 +175,11 @@ jobs:

strategy:
matrix:
node: [16]
node: [20]

steps:
- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
registry-url: 'https://registry.npmjs.org'
Expand All @@ -207,8 +205,7 @@ jobs:
tar xvf *.tgz --strip-components=1
- name: Build executables
run: |
pkg . --out-path dist-pkg
run: npm run pkg

- name: Rename linuxstatic to linux
run: |
Expand Down Expand Up @@ -265,15 +262,13 @@ jobs:
- uses: actions/checkout@v3

- name: Set up QEMU
run: |
sudo apt update
sudo apt install --reinstall -y qemu-user-static
uses: docker/setup-qemu-action@v2

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

- name: Login to DockerHub
uses: docker/login-action@v1
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand All @@ -291,7 +286,7 @@ jobs:
- run: find .

- name: Publish flood:master-distroless to Docker Hub
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: .
file: ./distribution/containers/Dockerfile.distroless
Expand All @@ -301,7 +296,7 @@ jobs:
tags: jesec/flood:master-distroless

- name: Publish rtorrent-flood:master-distroless to Docker Hub
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: .
file: ./distribution/containers/Dockerfile.distroless
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,17 @@ jobs:

strategy:
matrix:
node: [16]
node: [20]

steps:
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
registry-url: 'https://registry.npmjs.org'
cache: npm

- run: sudo npm i -g pkg
- run: npm ci
Expand Down Expand Up @@ -90,10 +91,10 @@ jobs:
sudo apt install --reinstall -y qemu-user-static
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand All @@ -109,12 +110,12 @@ jobs:
- run: sleep 120

- name: Publish to Docker Hub
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
build-args: VERSION=${{ steps.parse_semver.outputs.FULL_VERSION }}
context: .
file: ./distribution/containers/Dockerfile.release
platforms: linux/amd64,linux/arm64,linux/arm/v7
platforms: linux/amd64,linux/arm64
push: true
tags: |
jesec/flood:latest
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/test-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,39 +10,39 @@ on:

jobs:
test-backend:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
matrix:
node: [14, 16]
node: ['18', '20']
fail-fast: false

steps:
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: npm

- run: sudo add-apt-repository -y ppa:qbittorrent-team/qbittorrent-stable
- run: sudo add-apt-repository -y ppa:transmissionbt/ppa
- run: sudo apt-get install -y qbittorrent-nox transmission-daemon

- run: |
wget https://nightly.link/jesec/rtorrent/workflows/publish-rolling/master/rtorrent-deb-amd64.zip
unzip rtorrent-deb-amd64.zip
sudo dpkg -i rtorrent-deb.deb
wget https://github.com/jesec/rtorrent/releases/latest/download/rtorrent-linux-amd64.deb
sudo dpkg -i rtorrent-linux-amd64.deb
- run: npm ci
- run: npm test || npm test || npm test

- uses: codecov/codecov-action@v1
if: matrix.node == 16
- uses: codecov/codecov-action@v3
if: matrix.node == 20

- run: |
sudo apt-get remove --purge -y rtorrent
sudo apt-get install -y rtorrent
- run: npm test -- --selectProjects rtorrent || npm test -- --selectProjects rtorrent || npm test -- --selectProjects rtorrent
if: matrix['node'] == '16'
if: matrix['node'] == '20'
Loading

0 comments on commit d5f9573

Please sign in to comment.