ci/x86_64: rename appimageubuntu workflow to appimage-x86_64

- the AppImage is compatible with a wider range of distributions beyond just Ubuntu Signed-off-by: Bindea Cristian <cristian.bindea@analog.com>
analogdevicesinc · Jun 10, 2024 · 8da71bc · 8da71bc
1 parent 28545e4
commit 8da71bc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/appimageubuntu.yml → .github/workflows/appimage-x86_64.yml b/.github/workflows/appimageubuntu.yml → .github/workflows/appimage-x86_64.yml
@@ -1,4 +1,4 @@
-name: Ubuntu Scopy Appimage Build
+name: Scopy1 x86_64 AppImage Build
 
 on: [push, pull_request]
 
@@ -8,7 +8,7 @@ env:
 
 jobs:
 
-  build_scopy1_ubuntu_appimage:
+  build_scopy1_x86-64_appimage:
     runs-on: ubuntu-20.04
 
     steps:
@@ -17,23 +17,23 @@ jobs:
                 set-safe-directory: 'true'
 
         - name: Pull the Docker Image
-          run: docker pull cristianbindea/scopy1-ubuntu-appimage:latest
+          run: docker pull cristianbindea/scopy1-x86_64-appimage:latest
 
         - name: Create Scopy AppImage
           shell: bash
           run: |
                 export CI_SCRIPT=ON
                 cd $GITHUB_WORKSPACE
-                ./CI/appimage/ubuntu_appimage_process.sh generate_ci_envs
+                ./CI/x86_64/x86-64_appimage_process.sh generate_ci_envs
 
                 docker run \
                         --mount type=bind,source="$GITHUB_WORKSPACE",target=/home/runner/scopy \
-                        --env-file $GITHUB_WORKSPACE/CI/appimage/gh-actions.envs \
-                        cristianbindea/scopy1-ubuntu-appimage:latest \
+                        --env-file $GITHUB_WORKSPACE/CI/x86_64/gh-actions.envs \
+                        cristianbindea/scopy1-x86_64-appimage:latest \
                         /bin/bash -c    'cd $HOME && \
                                         sudo chown -R runner:runner scopy && \
                                         cd $HOME/scopy && \
-                                        ./CI/appimage/ubuntu_appimage_process.sh download_tools build_iio-emu build_scopy create_appdir create_appimage move_appimage
+                                        ./CI/x86_64/x86-64_appimage_process.sh download_tools build_iio-emu build_scopy create_appdir create_appimage move_appimage
                                         '
         - name: Set short git commit SHA
           shell: bash

diff --git a/.gitignore b/.gitignore
@@ -23,7 +23,7 @@ android*.sh
 CI/armhf/staging
 CI/armhf/scopy.AppDir
 CI/armhf/scopy.squashfs
-CI/appimage/staging
-CI/appimage/scopy.AppDir
+CI/x86_64/staging
+CI/x86_64/scopy.AppDir
 html/
 build_arm64-v8a/
diff --git a/CI/appimage/AppRun → CI/x86_64/AppRun b/CI/appimage/AppRun → CI/x86_64/AppRun
diff --git a/CI/appimage/docker/Dockerfile → CI/x86_64/docker/Dockerfile b/CI/appimage/docker/Dockerfile → CI/x86_64/docker/Dockerfile
@@ -26,9 +26,9 @@ WORKDIR /home/${USER}
 RUN git clone https://github.com/analogdevicesinc/scopy --branch appimage-scopy1
 WORKDIR /home/${USER}/scopy
 
-RUN ./CI/appimage/ubuntu_appimage_process.sh install_packages
+RUN ./CI/x86_64/x86-64_appimage_process.sh install_packages
 RUN sudo pip3 install aqtinstall && sudo python3 -m aqt install-qt --outputdir /opt/Qt linux desktop 5.15.2
-RUN ./CI/appimage/ubuntu_appimage_process.sh clone download_tools build_deps
+RUN ./CI/x86_64/x86-64_appimage_process.sh clone download_tools build_deps
 
 # to be set at runtime CI_SCRIPT=ON
 WORKDIR /home/${USER}

diff --git a/CI/appimage/scopy.desktop → CI/x86_64/scopy.desktop b/CI/appimage/scopy.desktop → CI/x86_64/scopy.desktop
diff --git a/CI/appimage/ubuntu_appimage_process.sh → CI/x86_64/x86-64_appimage_process.sh b/CI/appimage/ubuntu_appimage_process.sh → CI/x86_64/x86-64_appimage_process.sh
@@ -35,14 +35,14 @@ PYTHON_VERSION=python3.8
 
 QT_LOCATION=/opt/Qt/5.15.2/gcc_64
 
-STAGING_AREA=$SRC_DIR/CI/appimage/staging
+STAGING_AREA=$SRC_DIR/CI/x86_64/staging
 QMAKE_BIN=$QT_LOCATION/bin/qmake
 CMAKE_BIN=${STAGING_AREA}/cmake/bin/cmake
 JOBS=-j14
 
 APP_DIR_NAME=scopy.AppDir
-APP_DIR=$SRC_DIR/CI/appimage/$APP_DIR_NAME
-APP_IMAGE=$SRC_DIR/CI/appimage/Scopy1-x86_64.AppImage
+APP_DIR=$SRC_DIR/CI/x86_64/$APP_DIR_NAME
+APP_IMAGE=$SRC_DIR/CI/x86_64/Scopy1-x86_64.AppImage
 
 if [ "$USE_STAGING" == "ON" ]
 	then
@@ -343,8 +343,8 @@ create_appdir(){
 	${STAGING_AREA}/linuxdeploy-x86_64.AppImage \
 		--appdir  $APP_DIR \
 		--executable $SRC_DIR/build/scopy \
-		--custom-apprun $SRC_DIR/CI/appimage/AppRun \
-		--desktop-file $SRC_DIR/CI/appimage/scopy.desktop \
+		--custom-apprun $SRC_DIR/CI/x86_64/AppRun \
+		--desktop-file $SRC_DIR/CI/x86_64/scopy.desktop \
 		--icon-file $SRC_DIR/resources/Scopy.png \
 		--plugin qt
 
@@ -386,7 +386,7 @@ create_appimage(){
 }
 
 generate_ci_envs(){
-	$GITHUB_WORKSPACE/CI/appveyor/gen_ci_envs.sh > $GITHUB_WORKSPACE/CI/appimage/gh-actions.envs
+	$GITHUB_WORKSPACE/CI/appveyor/gen_ci_envs.sh > $GITHUB_WORKSPACE/CI/x86_64/gh-actions.envs
 }
 
 move_appimage(){