Skip to content

Commit eeac7cf

Browse files
committed
revert release option
1 parent 977b13a commit eeac7cf

File tree

1 file changed

+6
-38
lines changed

1 file changed

+6
-38
lines changed

.github/workflows/release.yml

+6-38
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ on:
1010
commit:
1111
description: Commit to be released
1212
required: false
13-
rc:
14-
description: "release candidate"
15-
required: false
16-
default: false
17-
type: boolean
1813

1914
defaults:
2015
run:
@@ -27,7 +22,6 @@ concurrency:
2722
env:
2823
VERSION: "${{ github.event.inputs.version }}"
2924
COMMIT: "${{ github.event.inputs.commit }}"
30-
RELEASE_CANDIDATE: "${{ github.event.inputs.rc }}"
3125

3226
jobs:
3327
test:
@@ -76,29 +70,22 @@ jobs:
7670
environment: staging
7771
runs-on: ubuntu-latest
7872
needs: test
73+
env:
74+
PACKAGE_NAME: "logsmith_linux_${VERSION}.zip"
7975

8076
steps:
8177
- name: Checkout
8278
uses: actions/checkout@v3
8379
with:
8480
ref: ${{ env.COMMIT }}
8581

86-
- name: Set package name
87-
run: |
88-
if [ "${{ env.RELEASE_CANDIDATE }}" = "true" ]; then
89-
export PACKAGE_NAME="logsmith_linux_${VERSION}-rc.zip" >> $GITHUB_ENV
90-
else
91-
export PACKAGE_NAME="logsmith_linux_${VERSION}.zip" >> $GITHUB_ENV
92-
fi
93-
9482
- name: Setup Python
9583
uses: actions/setup-python@v4
9684
with:
9785
python-version: 3.11
9886

9987
- name: Setup Project
10088
run: |
101-
sudo apt-get install libxcb-cursor0 libxcb-xinerama0 libxcb-xkb1 libxkbcommon-x11-0
10289
python -m pip install --upgrade pip
10390
pip install -r requirements.txt
10491
@@ -115,17 +102,10 @@ jobs:
115102
commit=${GITHUB_SHA}
116103
fi
117104
118-
if [ "${{ env.RELEASE_CANDIDATE }}" = "true" ]; then
119-
version="${VERSION}-rc"
120-
else
121-
version="${VERSION}"
122-
fi
123-
124-
125105
pip install requests
126106
./ci/release.py \
127107
--repository "${{ github.repository }}" \
128-
--version "${version}" \
108+
--version "${{ env.VERSION }}" \
129109
--commit "${commit}" \
130110
--token "${{ secrets.GITHUB_TOKEN }}" \
131111
--asset "${{ env.PACKAGE_NAME }}"
@@ -135,21 +115,15 @@ jobs:
135115
environment: staging
136116
runs-on: macos-latest
137117
needs: test
118+
env:
119+
PACKAGE_NAME: "logsmith_darwin_${VERSION}.zip"
138120

139121
steps:
140122
- name: Checkout
141123
uses: actions/checkout@v3
142124
with:
143125
ref: ${{ env.COMMIT }}
144126

145-
- name: Set package name
146-
run: |
147-
if [ "${{ env.RELEASE_CANDIDATE }}" = "true" ]; then
148-
export PACKAGE_NAME="logsmith_darwin_${VERSION}-rc.zip" >> $GITHUB_ENV
149-
else
150-
export PACKAGE_NAME="logsmith_darwin_${VERSION}.zip" >> $GITHUB_ENV
151-
fi
152-
153127
- name: Setup Python
154128
uses: actions/setup-python@v4
155129
with:
@@ -173,16 +147,10 @@ jobs:
173147
commit=${GITHUB_SHA}
174148
fi
175149
176-
if [ "${{ env.RELEASE_CANDIDATE }}" = "true" ]; then
177-
version="${VERSION}-rc"
178-
else
179-
version="${VERSION}"
180-
fi
181-
182150
pip install requests
183151
./ci/release.py \
184152
--repository "${{ github.repository }}" \
185-
--version "${version}" \
153+
--version "${{ env.VERSION }}" \
186154
--commit "${commit}" \
187155
--token "${{ secrets.GITHUB_TOKEN }}" \
188156
--asset "${{ env.PACKAGE_NAME }}"

0 commit comments

Comments
 (0)