Skip to content

Commit

Permalink
Merge pull request #1506 from skalenetwork/beta-to-develop
Browse files Browse the repository at this point in the history
Beta to develop
  • Loading branch information
DmytroNazarenko committed Jun 23, 2023
2 parents f180af6 + f57af8b commit d16d361
Show file tree
Hide file tree
Showing 53 changed files with 3,699 additions and 942 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ on:
- develop
- beta
- stable
push:
tags:
- 'custom-release-*'

jobs:
build:
runs-on: ubuntu-latest
if: github.event.pull_request.merged
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
Expand Down Expand Up @@ -49,7 +51,6 @@ jobs:
with:
python-version: 3.8


- name: Build and publish container
run: |
export BRANCH=${GITHUB_REF##*/}
Expand Down Expand Up @@ -92,21 +93,21 @@ jobs:
working-directory: ${{env.PROXY_DIR}}
env:
VERSION: ${{ env.VERSION }}
run: |
run: |
./predeployed/scripts/build_package.sh
- name: Publish predeployed pip package
working-directory: ${{env.PROXY_DIR}}
env:
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
run: |
run: |
./predeployed/scripts/publish_package.sh
- name: Generate ABIs
working-directory: ${{env.PROXY_DIR}}/predeployed
env:
VERSION: ${{ env.VERSION }}
run: |
run: |
python3 -m venv scripts/venv
source scripts/venv/bin/activate
pip install dist/ima_predeployed-*.whl
Expand All @@ -123,7 +124,7 @@ jobs:
release_name: ${{ env.VERSION }}
draft: false
prerelease: ${{ env.PRERELEASE }}

- name: Upload Release Assets
id: upload-release-assets
uses: dwenegar/upload-release-assets@v1
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.0
2.0.0
1 change: 0 additions & 1 deletion npms/skale-observer/observer.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

// SPDX-License-Identifier: AGPL-3.0-only

/**
Expand Down
1 change: 0 additions & 1 deletion npms/skale-observer/observerWorker.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

// SPDX-License-Identifier: AGPL-3.0-only

/**
Expand Down
1 change: 0 additions & 1 deletion npms/skale-owasp/owaspUtils.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

// SPDX-License-Identifier: AGPL-3.0-only

/**
Expand Down
Loading

0 comments on commit d16d361

Please sign in to comment.