diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea5ecc3..dd0aefe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,11 +10,6 @@ on: commit: description: Commit to be released required: false - rc: - description: "release candidate" - required: false - default: false - type: boolean defaults: run: @@ -27,7 +22,6 @@ concurrency: env: VERSION: "${{ github.event.inputs.version }}" COMMIT: "${{ github.event.inputs.commit }}" - RELEASE_CANDIDATE: "${{ github.event.inputs.rc }}" jobs: test: @@ -76,6 +70,8 @@ jobs: environment: staging runs-on: ubuntu-latest needs: test + env: + PACKAGE_NAME: "logsmith_linux_${VERSION}.zip" steps: - name: Checkout @@ -83,14 +79,6 @@ jobs: with: ref: ${{ env.COMMIT }} - - name: Set package name - run: | - if [ "${{ env.RELEASE_CANDIDATE }}" = "true" ]; then - export PACKAGE_NAME="logsmith_linux_${VERSION}-rc.zip" >> $GITHUB_ENV - else - export PACKAGE_NAME="logsmith_linux_${VERSION}.zip" >> $GITHUB_ENV - fi - - name: Setup Python uses: actions/setup-python@v4 with: @@ -98,7 +86,6 @@ jobs: - name: Setup Project run: | - sudo apt-get install libxcb-cursor0 libxcb-xinerama0 libxcb-xkb1 libxkbcommon-x11-0 python -m pip install --upgrade pip pip install -r requirements.txt @@ -115,17 +102,10 @@ jobs: commit=${GITHUB_SHA} fi - if [ "${{ env.RELEASE_CANDIDATE }}" = "true" ]; then - version="${VERSION}-rc" - else - version="${VERSION}" - fi - - pip install requests ./ci/release.py \ --repository "${{ github.repository }}" \ - --version "${version}" \ + --version "${{ env.VERSION }}" \ --commit "${commit}" \ --token "${{ secrets.GITHUB_TOKEN }}" \ --asset "${{ env.PACKAGE_NAME }}" @@ -135,6 +115,8 @@ jobs: environment: staging runs-on: macos-latest needs: test + env: + PACKAGE_NAME: "logsmith_darwin_${VERSION}.zip" steps: - name: Checkout @@ -142,14 +124,6 @@ jobs: with: ref: ${{ env.COMMIT }} - - name: Set package name - run: | - if [ "${{ env.RELEASE_CANDIDATE }}" = "true" ]; then - export PACKAGE_NAME="logsmith_darwin_${VERSION}-rc.zip" >> $GITHUB_ENV - else - export PACKAGE_NAME="logsmith_darwin_${VERSION}.zip" >> $GITHUB_ENV - fi - - name: Setup Python uses: actions/setup-python@v4 with: @@ -173,16 +147,10 @@ jobs: commit=${GITHUB_SHA} fi - if [ "${{ env.RELEASE_CANDIDATE }}" = "true" ]; then - version="${VERSION}-rc" - else - version="${VERSION}" - fi - pip install requests ./ci/release.py \ --repository "${{ github.repository }}" \ - --version "${version}" \ + --version "${{ env.VERSION }}" \ --commit "${commit}" \ --token "${{ secrets.GITHUB_TOKEN }}" \ --asset "${{ env.PACKAGE_NAME }}"