Merge branch 'angristan:master' into master
This commit is contained in:
commit
75d0bdf605
2 changed files with 7 additions and 6 deletions
4
.github/workflows/lint.yml
vendored
4
.github/workflows/lint.yml
vendored
|
@ -1,4 +1,4 @@
|
||||||
on: [push, pull_request]
|
on: [push, pull_request, workflow_dispatch]
|
||||||
|
|
||||||
name: Lint
|
name: Lint
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
uses: actions/checkout@v3.2.0
|
uses: actions/checkout@v4
|
||||||
- name: Lint Code Base
|
- name: Lint Code Base
|
||||||
uses: github/super-linter@v4.1.0
|
uses: github/super-linter@v4.1.0
|
||||||
env:
|
env:
|
||||||
|
|
9
.github/workflows/test.yml
vendored
9
.github/workflows/test.yml
vendored
|
@ -3,6 +3,7 @@ on:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
- ci
|
- ci
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
name: Test
|
name: Test
|
||||||
jobs:
|
jobs:
|
||||||
|
@ -17,13 +18,13 @@ jobs:
|
||||||
- debian-12-x64
|
- debian-12-x64
|
||||||
- ubuntu-20-04-x64
|
- ubuntu-20-04-x64
|
||||||
- ubuntu-22-04-x64
|
- ubuntu-22-04-x64
|
||||||
- fedora-37-x64
|
- ubuntu-24-04-x64
|
||||||
- fedora-38-x64
|
- fedora-39-x64
|
||||||
- centos-7-x64
|
- centos-7-x64
|
||||||
- centos-stream-8-x64
|
- centos-stream-8-x64
|
||||||
# - centos-stream-9-x64 # yum oomkill
|
# - centos-stream-9-x64 # yum oomkill
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3.2.0
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Setup doctl
|
- name: Setup doctl
|
||||||
uses: digitalocean/action-doctl@v2
|
uses: digitalocean/action-doctl@v2
|
||||||
|
@ -58,7 +59,7 @@ jobs:
|
||||||
host: ${{ steps.server_ip.outputs.value }}
|
host: ${{ steps.server_ip.outputs.value }}
|
||||||
username: root
|
username: root
|
||||||
key: ${{ secrets.SSH_KEY }}
|
key: ${{ secrets.SSH_KEY }}
|
||||||
script: set -x && apt-get update && apt-get install -y git
|
script: set -x && apt-get update && apt-get -o DPkg::Lock::Timeout=120 install -y git
|
||||||
|
|
||||||
- name: Setup remote server (Fedora)
|
- name: Setup remote server (Fedora)
|
||||||
if: steps.server_os.outputs.value == 'fedora'
|
if: steps.server_os.outputs.value == 'fedora'
|
||||||
|
|
Loading…
Reference in a new issue