Skip to content

Rename and Remove duplication from Artifacts on Release runs #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −34
Open

Rename and Remove duplication from Artifacts on Release runs #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:

jobs:
setup:
name: Setup and Check merged PRs (schedule only)git
name: Setup and Check merged PRs (schedule only)
runs-on: ubuntu-latest
outputs:
should_run: ${{ steps.check.outputs.should_run }}
Expand Down Expand Up @@ -164,15 +164,15 @@ jobs:
- name: Upload build artifacts
uses: actions/upload-artifact@v4
with:
name: eim-cli-${{ matrix.package_name }}-${{ github.run_number }}
name: eim-cli-${{ matrix.package_name }}-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}
path: release_cli/${{ matrix.package_name }}/eim

- name: Upload artifact for tag
if: startsWith(github.ref, 'refs/tags/')
uses: actions/upload-artifact@v4
with:
name: eim-cli-${{ matrix.package_name }}-${{ github.ref_name }}
path: release_cli/${{ matrix.package_name }}/eim
# - name: Upload artifact for tag
# if: startsWith(github.ref, 'refs/tags/')
# uses: actions/upload-artifact@v4
# with:
# name: eim-cli-${{ matrix.package_name }}-${{ github.ref_name }}
# path: release_cli/${{ matrix.package_name }}/eim

- name: Upload Release Asset - Unix
if: github.event_name == 'release' && github.event.action == 'created' && runner.os != 'Windows'
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
- name: Upload offline_installer_builder artifacts
uses: actions/upload-artifact@v4
with:
name: offline_installer_builder-${{ matrix.package_name }}-${{ github.run_number }}
name: offline_installer_builder-${{ matrix.package_name }}-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}
path: release_cli/${{ matrix.package_name }}/offline_installer_builder

- name: Upload offline_installer_builder Release Asset - Unix
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
if: github.event_name == 'release' && github.event.action == 'created'
uses: actions/upload-artifact@v4
with:
name: eim-cli-${{ matrix.package_name }}-${{ github.run_number }}-deb
name: eim-cli-${{ matrix.package_name }}-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}-deb
path: src-tauri/target/debian/eim*.deb
if-no-files-found: warn

Expand Down Expand Up @@ -413,15 +413,15 @@ jobs:
- name: Upload build artifacts
uses: actions/upload-artifact@v4
with:
name: eim-cli-${{ matrix.package_name }}-${{ github.run_number }}
name: eim-cli-${{ matrix.package_name }}-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}
path: release_cli/${{ matrix.package_name }}/eim${{ runner.os == 'Windows' && '.exe' || '' }}

- name: Upload artifact for tag
if: startsWith(github.ref, 'refs/tags/')
uses: actions/upload-artifact@v4
with:
name: eim-cli-${{ matrix.package_name }}-${{ github.ref_name }}
path: release_cli/${{ matrix.package_name }}/eim${{ runner.os == 'Windows' && '.exe' || '' }}
# - name: Upload artifact for tag
# if: startsWith(github.ref, 'refs/tags/')
# uses: actions/upload-artifact@v4
# with:
# name: eim-cli-${{ matrix.package_name }}-${{ github.ref_name }}
# path: release_cli/${{ matrix.package_name }}/eim${{ runner.os == 'Windows' && '.exe' || '' }}

- name: Upload Release Asset - MacOs
if: github.event_name == 'release' && github.event.action == 'created' && runner.os != 'Windows'
Expand Down Expand Up @@ -511,7 +511,7 @@ jobs:
- name: Upload offline_installer_builder build artifacts
uses: actions/upload-artifact@v4
with:
name: offline_installer_builder-${{ matrix.package_name }}-${{ github.run_number }}
name: offline_installer_builder-${{ matrix.package_name }}-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}
path: release_cli/${{ matrix.package_name }}/offline_installer_builder${{ runner.os == 'Windows' && '.exe' || '' }}

- name: Upload offline_installer_builder Release Asset - MacOs
Expand Down Expand Up @@ -696,7 +696,7 @@ jobs:
if: startsWith(matrix.os, 'ubuntu')
uses: actions/upload-artifact@v4
with:
name: eim-gui-${{ matrix.package_name }}-${{ github.run_number }}
name: eim-gui-${{ matrix.package_name }}-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}
path: |
src-tauri/target/release/eim
# src-tauri/target/release/bundle/deb/*.deb
Expand All @@ -708,7 +708,7 @@ jobs:
if: startsWith(matrix.os, 'ubuntu')
uses: actions/upload-artifact@v4
with:
name: eim-gui-${{ matrix.package_name }}-${{ github.run_number }}-deb
name: eim-gui-${{ matrix.package_name }}-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}-deb
path: |
src-tauri/target/release/bundle/deb/*.deb
# src-tauri/target/release/bundle/rpm/*.rpm
Expand All @@ -719,7 +719,7 @@ jobs:
if: startsWith(matrix.os, 'ubuntu')
uses: actions/upload-artifact@v4
with:
name: eim-gui-${{ matrix.package_name }}-${{ github.run_number }}-rpm
name: eim-gui-${{ matrix.package_name }}-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}-rpm
path: |
src-tauri/target/release/bundle/rpm/*.rpm
# src-tauri/target/release/bundle/appimage/*.AppImage
Expand All @@ -729,7 +729,7 @@ jobs:
if: startsWith(matrix.os, 'ubuntu')
uses: actions/upload-artifact@v4
with:
name: eim-gui-${{ matrix.package_name }}-${{ github.run_number }}-AppImage
name: eim-gui-${{ matrix.package_name }}-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}-AppImage
path: |
src-tauri/target/release/bundle/appimage/*.AppImage
if-no-files-found: warn
Expand All @@ -738,7 +738,7 @@ jobs:
if: startsWith(matrix.os, 'macos')
uses: actions/upload-artifact@v4
with:
name: eim-gui-${{ matrix.package_name }}-${{ github.run_number }}
name: eim-gui-${{ matrix.package_name }}-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}
path: |
# src-tauri/target/release/bundle/macos/eim.app
# src-tauri/target/release/bundle/dmg/*.dmg
Expand All @@ -749,7 +749,7 @@ jobs:
if: startsWith(matrix.os, 'macos')
uses: actions/upload-artifact@v4
with:
name: eim-gui-${{ matrix.package_name }}-${{ github.run_number }}-dmg
name: eim-gui-${{ matrix.package_name }}-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}-dmg
path: |
src-tauri/target/release/bundle/dmg/*.dmg
if-no-files-found: warn
Expand All @@ -758,7 +758,7 @@ jobs:
if: runner.os == 'Windows'
uses: actions/upload-artifact@v4
with:
name: eim-gui-${{ matrix.package_name }}-${{ github.run_number }}
name: eim-gui-${{ matrix.package_name }}-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}
path: |
src-tauri/target/release/eim.exe
# src-tauri/target/release/bundle/msi/*.msi
Expand All @@ -768,7 +768,7 @@ jobs:
if: runner.os == 'Windows'
uses: actions/upload-artifact@v4
with:
name: eim-gui-${{ matrix.package_name }}-${{ github.run_number }}-msi
name: eim-gui-${{ matrix.package_name }}-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}-msi
path: |
src-tauri/target/release/bundle/msi/*.msi
if-no-files-found: warn
Expand Down Expand Up @@ -1043,7 +1043,7 @@ jobs:
git commit -m "Update eim formula and cask to version ${{ steps.release-info.outputs.tag_name }}" || exit 0
git push

uupdate-apt-repo:
update-apt-repo:
name: Update APT Repository on S3
needs: [build-cli-linux, build-gui, update-release-info]
runs-on: ubuntu-latest
Expand All @@ -1067,26 +1067,26 @@ jobs:
- name: Download GUI linux-x64 .deb artifact
uses: actions/download-artifact@v4
with:
name: eim-gui-linux-x64-${{ github.run_number }}-deb
name: eim-gui-linux-x64-${{ github.ref_name }}-deb
path: new-debs/

- name: Download GUI linux-aarch64 .deb artifact
uses: actions/download-artifact@v4
with:
name: eim-gui-linux-aarch64-${{ github.run_number }}-deb
name: eim-gui-linux-aarch64-${{ github.ref_name }}-deb
path: new-debs/
continue-on-error: true

- name: Download CLI linux-x64 .deb artifact
uses: actions/download-artifact@v4
with:
name: eim-cli-linux-x64-${{ github.run_number }}-deb
name: eim-cli-linux-x64-${{ github.ref_name }}-deb
path: new-debs/

- name: Download CLI linux-aarch64 .deb artifact
uses: actions/download-artifact@v4
with:
name: eim-cli-linux-aarch64-${{ github.run_number }}-deb
name: eim-cli-linux-aarch64-${{ github.ref_name }}-deb
path: new-debs/
continue-on-error: true

Expand Down Expand Up @@ -1165,13 +1165,13 @@ jobs:
- name: Download CLI windows-x64 artifact
uses: actions/download-artifact@v4
with:
name: eim-cli-windows-x64-${{ github.run_number }}
name: eim-cli-windows-x64-${{ github.ref_name }}
path: artifacts/cli/

- name: Download GUI windows-x64 artifact
uses: actions/download-artifact@v4
with:
name: eim-gui-windows-x64-${{ github.run_number }}
name: eim-gui-windows-x64-${{ github.ref_name }}
path: artifacts/gui/

- name: Setup .NET 6.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ jobs:
uses: actions/upload-artifact@v4
if: matrix.os != 'windows-latest'
with:
name: autotest-CLI-results-${{ matrix.package_name }}${{ matrix.run_on == 'MirrorRunner' && '-AlternateMirrors' || '' }}$${{ matrix.os == 'self-hosted' && '-CN' || '' }}
name: autotest-CLI-results-${{ matrix.package_name }}${{ matrix.run_on == 'MirrorRunner' && '-AlternateMirrors' || '' }}${{ matrix.os == 'self-hosted' && '-CN' || '' }}
path: |
./tests/results-*.json
./tests/*.log
Expand Down
Loading