Skip to content

Commit

Permalink
Normalize indentation for YAML, convert to LF
Browse files Browse the repository at this point in the history
Change back from CRLF, normalize indentations as 2 spaces. Some files were using 3, 4, and some were even using more than one convention in the same file.
  • Loading branch information
Lord-Kamina authored and Baklap4 committed Jan 8, 2025
1 parent 84eedfe commit 4f81a00
Show file tree
Hide file tree
Showing 5 changed files with 647 additions and 647 deletions.
156 changes: 78 additions & 78 deletions .github/workflows/appimage.yml
Original file line number Diff line number Diff line change
@@ -1,78 +1,78 @@
name: Build AppImage Packages

on:
# Run when called from other workflows
workflow_call:
inputs:
package_complete_version:
description: 'The output of the complete_version of the "determine_version" job from the build_and_release.yml workflow'
required: true
type: string
release_id:
description: 'The output of the "create_release" job from the build_and_release.yml workflow'
required: true
type: string

jobs:
# Create the AppImage
AppImage:
name: Create the AppImage
runs-on: ubuntu-22.04
steps:
- name: Install the AppImage bundler and Performous deps
id: fetch_deps
run: |
wget -O appimage-builder-x86_64.AppImage https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.0.0-beta.1/appimage-builder-1.0.0-677acbd-x86_64.AppImage
chmod +x appimage-builder-x86_64.AppImage
sudo mv appimage-builder-x86_64.AppImage /usr/local/bin/appimage-builder
sudo apt update
sudo apt-get install -y --no-install-recommends git cmake build-essential gettext help2man libopenblas-dev libfftw3-dev libicu-dev libepoxy-dev libsdl2-dev libfreetype6-dev libpango1.0-dev librsvg2-dev libxml++2.6-dev libavcodec-dev libavformat-dev libswscale-dev libjpeg-dev portaudio19-dev libglm-dev libboost-filesystem-dev libboost-iostreams-dev libboost-locale-dev libboost-system-dev libboost-program-options-dev libssl-dev libcpprest-dev libgtest-dev libgmock-dev google-mock libportmidi-dev libopencv-dev libaubio-dev nlohmann-json3-dev libfmt-dev libfuse2
- name: Checkout Git
id: checkout_git
uses: actions/checkout@v4

- name: Build the AppImage
id: build_appimage
run: |
# Pull in our common build functions
. .github/workflows/build_functions.sh
PACKAGE_VERSION=${{ inputs.package_complete_version }}
sed -i s/@@VERSION@@/${PACKAGE_VERSION}/ AppImageBuilder.yml
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WEBSERVER=ON -DENABLE_WEBCAM=ON -DSELF_BUILT_CED=ALWAYS -DPERFORMOUS_VERSION=$PACKAGE_VERSION ..
make -j$(nproc) install DESTDIR=../AppDir
cd ..
appimage-builder --recipe AppImageBuilder.yml --skip-test
# Provided by the common build functions
package_name "$(pwd)" "*.AppImage" "${PACKAGE_VERSION}"
# Upload artifacts during pull-requests
- name: Upload artifact
uses: actions/upload-artifact@v4
if: ${{ github.event_name == 'pull_request' }}
with:
name: ${{ env.ARTIFACT_NAME }}
path: ${{ env.ARTIFACT_PATH }}

# Upload artifacts on master
- name: Upload artifact with unified name
if: ${{ github.ref == 'refs/heads/master' }}
uses: actions/upload-artifact@v4
with:
name: ${{ env.MASTER_ARTIFACT_NAME }}
path: ${{ env.MASTER_ARTIFACT_PATH }}

# Upload artifacts to releases only during Release events
- name: Upload artifacts to tagged release
id: upload_assets
if: ${{ github.event_name != 'pull_request' && github.ref_type == 'tag' }}
uses: xresloader/upload-to-github-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
release_id: ${{ inputs.release_id }}
file: ${{ env.ARTIFACT_PATH }}
name: Build AppImage Packages

on:
# Run when called from other workflows
workflow_call:
inputs:
package_complete_version:
description: 'The output of the complete_version of the "determine_version" job from the build_and_release.yml workflow'
required: true
type: string
release_id:
description: 'The output of the "create_release" job from the build_and_release.yml workflow'
required: true
type: string

jobs:
# Create the AppImage
AppImage:
name: Create the AppImage
runs-on: ubuntu-22.04
steps:
- name: Install the AppImage bundler and Performous deps
id: fetch_deps
run: |
wget -O appimage-builder-x86_64.AppImage https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.0.0-beta.1/appimage-builder-1.0.0-677acbd-x86_64.AppImage
chmod +x appimage-builder-x86_64.AppImage
sudo mv appimage-builder-x86_64.AppImage /usr/local/bin/appimage-builder
sudo apt update
sudo apt-get install -y --no-install-recommends git cmake build-essential gettext help2man libopenblas-dev libfftw3-dev libicu-dev libepoxy-dev libsdl2-dev libfreetype6-dev libpango1.0-dev librsvg2-dev libxml++2.6-dev libavcodec-dev libavformat-dev libswscale-dev libjpeg-dev portaudio19-dev libglm-dev libboost-filesystem-dev libboost-iostreams-dev libboost-locale-dev libboost-system-dev libboost-program-options-dev libssl-dev libcpprest-dev libgtest-dev libgmock-dev google-mock libportmidi-dev libopencv-dev libaubio-dev nlohmann-json3-dev libfmt-dev libfuse2
- name: Checkout Git
id: checkout_git
uses: actions/checkout@v4

- name: Build the AppImage
id: build_appimage
run: |
# Pull in our common build functions
. .github/workflows/build_functions.sh
PACKAGE_VERSION=${{ inputs.package_complete_version }}
sed -i s/@@VERSION@@/${PACKAGE_VERSION}/ AppImageBuilder.yml
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WEBSERVER=ON -DENABLE_WEBCAM=ON -DSELF_BUILT_CED=ALWAYS -DPERFORMOUS_VERSION=$PACKAGE_VERSION ..
make -j$(nproc) install DESTDIR=../AppDir
cd ..
appimage-builder --recipe AppImageBuilder.yml --skip-test
# Provided by the common build functions
package_name "$(pwd)" "*.AppImage" "${PACKAGE_VERSION}"
# Upload artifacts during pull-requests
- name: Upload artifact
uses: actions/upload-artifact@v4
if: ${{ github.event_name == 'pull_request' }}
with:
name: ${{ env.ARTIFACT_NAME }}
path: ${{ env.ARTIFACT_PATH }}

# Upload artifacts on master
- name: Upload artifact with unified name
if: ${{ github.ref == 'refs/heads/master' }}
uses: actions/upload-artifact@v4
with:
name: ${{ env.MASTER_ARTIFACT_NAME }}
path: ${{ env.MASTER_ARTIFACT_PATH }}

# Upload artifacts to releases only during Release events
- name: Upload artifacts to tagged release
id: upload_assets
if: ${{ github.event_name != 'pull_request' && github.ref_type == 'tag' }}
uses: xresloader/upload-to-github-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
release_id: ${{ inputs.release_id }}
file: ${{ env.ARTIFACT_PATH }}
16 changes: 8 additions & 8 deletions .github/workflows/build_and_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@ jobs:
echo "version_tweak=0" >> $GITHUB_OUTPUT
if [[ ${{ github.event_name }} == "push" ]]; then
COMMIT_SHA=$(git rev-parse --short=7 ${{ github.event.after }})
COMMIT_SHA=$(git rev-parse --short=7 ${{ github.event.after }})
elif [[ ${{ github.event_name }} == "pull_request" ]]; then
COMMIT_SHA=$(git rev-parse --short=7 ${{ github.event.pull_request.head.sha }})
COMMIT_SHA=$(git rev-parse --short=7 ${{ github.event.pull_request.head.sha }})
fi
if [[ ${{ github.ref_type }} == "tag" ]]; then
echo "complete_version=${{github.ref_name}}" >> $GITHUB_OUTPUT
echo "complete_version=${{github.ref_name}}" >> $GITHUB_OUTPUT
elif [[ ${{ github.ref_type }} == "branch" ]]; then
if [[ ${{ github.ref_name}} == "master" ]]; then
echo "complete_version=$LATEST_TAG_VERSION+git-${COMMIT_SHA}-beta" >> $GITHUB_OUTPUT
else
echo "complete_version=$LATEST_TAG_VERSION+git-${COMMIT_SHA}-PR${{github.event.pull_request.number}}-alpha" >> $GITHUB_OUTPUT
fi
if [[ ${{ github.ref_name}} == "master" ]]; then
echo "complete_version=$LATEST_TAG_VERSION+git-${COMMIT_SHA}-beta" >> $GITHUB_OUTPUT
else
echo "complete_version=$LATEST_TAG_VERSION+git-${COMMIT_SHA}-PR${{github.event.pull_request.number}}-alpha" >> $GITHUB_OUTPUT
fi
fi
Expand Down
Loading

0 comments on commit 4f81a00

Please sign in to comment.