diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index df7e4cbc84..fb3b3d8ac7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: Deploy Zou to staging environment and update apidocs on: push: branches: - - master + - main jobs: build: @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Update Zou on staging server - uses: appleboy/ssh-action@v0.1.4 + uses: appleboy/ssh-action@v1.2.0 with: host: ${{ secrets.HOST }} username: ${{ secrets.USERNAME }} diff --git a/RELEASE.md b/RELEASE.md index a4c8b26560..d87598c36f 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -3,9 +3,9 @@ We release Zou versions through Github Actions on Pypi. Every time a new version is ready, we follow this process: -1. Rebase on the master branch. +1. Rebase on the main branch. 2. Up the version number located the `zou/__version__` file. -3. Push changes to `master` branch. +3. Push changes to `main` branch. 4. Tag the commit and push the changes to Github. 5. Github Actions will build the package from the sources and publish the package on Pypi diff --git a/scripts/release.sh b/scripts/release.sh index a3628def17..5231f8ece3 100644 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -1,8 +1,8 @@ set -e -git pull --rebase origin master +git pull --rebase origin main last_release_number=$(python -c "from zou import __version__; print(__version__)") release_number=$(echo ${last_release_number} | awk -F. -v OFS=. '{$NF += 1 ; print}') echo "__version__ = \"$release_number\"" > zou/__init__.py git commit zou/__init__.py -m $release_number git tag v$release_number -git push origin master --tag +git push origin main --tag