Skip to content

Commit 0310040

Browse files
committed
CI: modify docker.yml
1 parent 9550146 commit 0310040

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

.github/workflows/docker.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ jobs:
160160
else
161161
docker_image="${{matrix.variant.image}}"
162162
fi
163-
./Script/build_linux.sh --docker --docker-image="${docker_image}" --docker-platform="${{matrix.variant.platform}}" --${{matrix.variant.PACKAGE}} ${{matrix.variant.qt}} -v
163+
./Script/build_linux.sh --docker --docker-image="${docker_image}" --docker-platform="${{matrix.variant.platform}}" --${{matrix.variant.PACKAGE}} -v
164164
165165
- name: Rename deb file
166166
if: ${{ matrix.variant.PACKAGE == 'deb' }}
@@ -172,11 +172,7 @@ jobs:
172172
else
173173
docker_image="${{matrix.variant.image}}"
174174
fi
175-
if [ -z "${{matrix.variant.qt}}" ]]; then
176-
mv rabbitim*.deb rabbitim_${{env.RabbitIm_VERSION}}_${docker_image}_`uname -m`.deb
177-
else
178-
mv rabbitim*.deb rabbitim_${{env.RabbitIm_VERSION}}_${{matrix.variant.qt}}_${docker_image}_`uname -m`.deb
179-
fi
175+
mv rabbitim*.deb rabbitim_${{env.RabbitIm_VERSION}}_${docker_image}_`uname -m`.deb
180176
181177
- name: AppIagme update configure file
182178
if: ${{ matrix.variant.PACKAGE == 'appimage' && matrix.variant.image == 'ubuntu'}}
@@ -227,7 +223,7 @@ jobs:
227223
#if: ${{matrix.variant.PACKAGE != 'deb'}}
228224
uses: actions/upload-artifact@v4
229225
with:
230-
name: ${{ env.artifact_name }}_${{matrix.variant.PACKAGE}}_${{matrix.variant.image}}_${{matrix.variant.lable}}_${{matrix.variant.qt}}_${{matrix.variant.os}}
226+
name: ${{ env.artifact_name }}_${{matrix.variant.PACKAGE}}_${{matrix.variant.image}}_${{matrix.variant.lable}}_${{matrix.variant.os}}
231227
path: |
232228
${{env.BUILD_DIR}}/build_linux/RabbitIm*.rpm
233229
${{env.BUILD_DIR}}/build_linux/rabbitim_*.deb

0 commit comments

Comments
 (0)