Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/next'
Browse files Browse the repository at this point in the history
  • Loading branch information
maksadbek committed Dec 10, 2024
2 parents 37dd4df + 166bce6 commit 59c970a
Show file tree
Hide file tree
Showing 28 changed files with 1,020 additions and 307 deletions.
22 changes: 10 additions & 12 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ env.TARGET_REF }}
token: ${{ secrets.GPR_TOKEN }}
Expand All @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
needs: install-deps
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ env.TARGET_REF }}
token: ${{ secrets.GPR_TOKEN }}
Expand All @@ -45,7 +45,7 @@ jobs:
- name: Pack artifacts
run: npm pack

- uses: svenstaro/upload-release-action@2.7.0
- uses: svenstaro/upload-release-action@2.9.0
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ./brightsec-cli-*
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
runs-on: ${{ matrix.os }}
container: ${{ matrix.container }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ env.TARGET_REF }}
token: ${{ secrets.GPR_TOKEN }}
Expand All @@ -97,11 +97,9 @@ jobs:
- name: Install dev-deps
if: startsWith(matrix.os, 'ubuntu')
run: |
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* \
&& sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* \
&& yum install build-essential python3 -y \
&& yum clean all -y \
&& rm -rf /var/cache/yum
dnf install -y dnf-utils \
&& dnf install -y python3 gcc gcc-c++ make \
&& rm -rf /var/cache/dnf
- name: Install deps
uses: ./.github/workflows/composite/npm
Expand All @@ -119,14 +117,14 @@ jobs:
run: .\tools\scripts\build-msi.ps1
shell: pwsh

- uses: svenstaro/upload-release-action@2.7.0
- uses: svenstaro/upload-release-action@2.9.0
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{ startsWith(matrix.os, 'win') && '.\bin\cli.exe' || './bin/cli' }}
asset_name: ${{ format('bright-cli-{0}-x64{1}', matrix.target, startsWith(matrix.os, 'win') && '.exe' || '') }}
tag: ${{ github.ref }}

- uses: svenstaro/upload-release-action@2.7.0
- uses: svenstaro/upload-release-action@2.9.0
if: startsWith(matrix.os, 'win')
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -138,7 +136,7 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ env.TARGET_REF }}
token: ${{ secrets.GPR_TOKEN }}
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@ jobs:
matrix:
include:
- os: ubuntu-latest
container: ubuntu:18.04
container: ubuntu:20.04
executable: bright-cli-linux-x64
node: 16
node: 20
- os: ubuntu-latest
container: ubuntu:16.04
container: ubuntu:22.04
executable: bright-cli-linux-x64
node: 16
node: 20
- os: ubuntu-latest
container: fedora:24
container: fedora:29
executable: bright-cli-linux-x64
node: 16
node: 20
- os: ubuntu-latest
container: fedora:latest
executable: bright-cli-linux-x64
Expand Down Expand Up @@ -234,17 +234,17 @@ jobs:
fail-fast: false
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
node: [16, 18, 20]
node: [20, 22]
include:
- os: ubuntu-latest
container: ubuntu:16.04
node: 16
container: ubuntu:20.04
node: 20
- os: ubuntu-latest
container: fedora:24
node: 16
container: fedora:29
node: 20
- os: ubuntu-latest
container: fedora:latest
node: 18
node: 22
- os: ubuntu-latest
container: fedora:latest
node: 20
Expand Down
Loading

0 comments on commit 59c970a

Please sign in to comment.