Skip to content

Commit

Permalink
revert release option
Browse files Browse the repository at this point in the history
  • Loading branch information
redvox committed Apr 4, 2024
1 parent 977b13a commit eeac7cf
Showing 1 changed file with 6 additions and 38 deletions.
44 changes: 6 additions & 38 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -27,7 +22,6 @@ concurrency:
env:
VERSION: "${{ github.event.inputs.version }}"
COMMIT: "${{ github.event.inputs.commit }}"
RELEASE_CANDIDATE: "${{ github.event.inputs.rc }}"

jobs:
test:
Expand Down Expand Up @@ -76,29 +70,22 @@ jobs:
environment: staging
runs-on: ubuntu-latest
needs: test
env:
PACKAGE_NAME: "logsmith_linux_${VERSION}.zip"

steps:
- name: Checkout
uses: actions/checkout@v3
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:
python-version: 3.11

- 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
Expand All @@ -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 }}"
Expand All @@ -135,21 +115,15 @@ jobs:
environment: staging
runs-on: macos-latest
needs: test
env:
PACKAGE_NAME: "logsmith_darwin_${VERSION}.zip"

steps:
- name: Checkout
uses: actions/checkout@v3
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:
Expand All @@ -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 }}"

0 comments on commit eeac7cf

Please sign in to comment.