diff --git a/.github/workflows/ASCII_Overmap_ci_build.yml b/.github/workflows/ASCII_Overmap_ci_build.yml index d7acbb23e2..0d874a1e50 100644 --- a/.github/workflows/ASCII_Overmap_ci_build.yml +++ b/.github/workflows/ASCII_Overmap_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggered by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/ASCII_Overmap folder name: ASCII_Overmap composer -env: - TILESET: ASCII_Overmap - COMPOSE_ARGS: --use-all - BUILD_DIR: build - on: push: branches: @@ -27,60 +16,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: ASCII_Overmap + composer-args: --use-all diff --git a/.github/workflows/Altica_ci_build.yml b/.github/workflows/Altica_ci_build.yml index 25f4466f27..c642c4f8b6 100644 --- a/.github/workflows/Altica_ci_build.yml +++ b/.github/workflows/Altica_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggered by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/Altica folder name: Altica composer -env: - TILESET: Altica - COMPOSE_ARGS: --use-all --obsolete-fillers - BUILD_DIR: build - on: push: branches: @@ -29,61 +18,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - cp "gfx/$TILESET/layering.json" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: Altica + composer-args: --use-all --obsolete-fillers diff --git a/.github/workflows/Chibi_ci_build.yml b/.github/workflows/Chibi_ci_build.yml index 814a47e83d..e2db45024f 100644 --- a/.github/workflows/Chibi_ci_build.yml +++ b/.github/workflows/Chibi_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggered by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/UltimateCataclysm, gfx/MShockXotto+/ or gfx/Chibi_Ultica/ folders name: Chibi_Ultica composer -env: - TILESET: Chibi_Ultica - COMPOSE_ARGS: --use-all - BUILD_DIR: build - on: push: branches: @@ -53,61 +42,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - cp "gfx/$TILESET/layering.json" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: Chibi_Ultica + composer-args: --use-all diff --git a/.github/workflows/HitButton_iso_ci_build.yml b/.github/workflows/HitButton_iso_ci_build.yml index 06b9287a84..9dfcaaff00 100644 --- a/.github/workflows/HitButton_iso_ci_build.yml +++ b/.github/workflows/HitButton_iso_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggered by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/HitButton_iso folder name: HitButton iso composer -env: - TILESET: HitButton_iso - COMPOSE_ARGS: --use-all - BUILD_DIR: build - on: push: branches: @@ -27,60 +16,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: HitButton_iso + composer-args: --use-all diff --git a/.github/workflows/Larwick_Overmap_ci_build.yml b/.github/workflows/Larwick_Overmap_ci_build.yml index c92ffb4eba..7260a0b24d 100644 --- a/.github/workflows/Larwick_Overmap_ci_build.yml +++ b/.github/workflows/Larwick_Overmap_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggered by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/Larwick_Overmap folder name: Larwick_Overmap composer -env: - TILESET: Larwick_Overmap - COMPOSE_ARGS: --use-all - BUILD_DIR: build - on: push: branches: @@ -27,60 +16,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: Larwick_Overmap + composer-args: --use-all diff --git a/.github/workflows/MD_ci_build.yml b/.github/workflows/MD_ci_build.yml index a3f46a64cb..272de5f9df 100644 --- a/.github/workflows/MD_ci_build.yml +++ b/.github/workflows/MD_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggered by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/Mushroom-Dream folder name: Mushroom-Dream composer -env: - TILESET: Mushroom-Dream - COMPOSE_ARGS: --use-all --obsolete-fillers - BUILD_DIR: build - on: push: branches: @@ -27,60 +16,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: Mushroom-Dream + composer-args: --use-all --obsolete-fillers diff --git a/.github/workflows/Neodays_ci_build.yml b/.github/workflows/Neodays_ci_build.yml index 9b602408a8..50b5a49c36 100644 --- a/.github/workflows/Neodays_ci_build.yml +++ b/.github/workflows/Neodays_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggered by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/NeoDays folder name: NeoDays composer -env: - TILESET: NeoDays - COMPOSE_ARGS: --use-all - BUILD_DIR: build - on: push: branches: @@ -27,60 +16,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: NeoDays + composer-args: --use-all diff --git a/.github/workflows/Retrodays_ci_build.yml b/.github/workflows/Retrodays_ci_build.yml index 03b52d3537..83c0b61ca4 100644 --- a/.github/workflows/Retrodays_ci_build.yml +++ b/.github/workflows/Retrodays_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggerd by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/RetroDays folder name: RetroDays composer -env: - TILESET: Retrodays - COMPOSE_ARGS: --use-all - BUILD_DIR: build - on: push: branches: @@ -27,60 +16,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: Retrodays + composer-args: --use-all diff --git a/.github/workflows/SurveyorsMap_ci_build.yml b/.github/workflows/SurveyorsMap_ci_build.yml index 3d009d2a1f..29458c7dfe 100644 --- a/.github/workflows/SurveyorsMap_ci_build.yml +++ b/.github/workflows/SurveyorsMap_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggered by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/SurveyorsMap folder name: SurveyorsMap composer -env: - TILESET: SurveyorsMap - COMPOSE_ARGS: --use-all - BUILD_DIR: build - on: push: branches: @@ -27,60 +16,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: SurveyorsMap + composer-args: --use-all diff --git a/.github/workflows/Ultica-iso_ci_build.yml b/.github/workflows/Ultica-iso_ci_build.yml index 2426caa1cf..34eb68d595 100644 --- a/.github/workflows/Ultica-iso_ci_build.yml +++ b/.github/workflows/Ultica-iso_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggered by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/Ultica_iso folder name: Ultica_iso composer -env: - TILESET: Ultica_iso - COMPOSE_ARGS: --use-all --obsolete-fillers - BUILD_DIR: build - on: push: branches: @@ -27,60 +16,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: Ultica_iso + composer-args: --use-all --obsolete-fillers diff --git a/.github/workflows/Ultica_ci_build.yml b/.github/workflows/Ultica_ci_build.yml index 917653e79b..05209b861d 100644 --- a/.github/workflows/Ultica_ci_build.yml +++ b/.github/workflows/Ultica_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggered by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/UltimateCataclysm folder name: UltimateCataclysm composer -env: - TILESET: UltimateCataclysm - COMPOSE_ARGS: --use-all --obsolete-fillers - BUILD_DIR: build - on: push: branches: @@ -27,61 +16,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - cp "gfx/$TILESET/layering.json" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: UltimateCataclysm + composer-args: --use-all --obsolete-fillers diff --git a/.github/workflows/blb_ci_build.yml b/.github/workflows/blb_ci_build.yml index 74e9a6612b..2c3186176a 100644 --- a/.github/workflows/blb_ci_build.yml +++ b/.github/workflows/blb_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggered by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/BrownLikeBears folder name: BrownLikeBears composer -env: - TILESET: BrownLikeBears - COMPOSE_ARGS: --use-all --obsolete-fillers - BUILD_DIR: build - on: push: branches: @@ -27,60 +16,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: BrownLikeBears + composer-args: --use-all --obsolete-fillers diff --git a/.github/workflows/composer_template.yml b/.github/workflows/composer_template.yml new file mode 100644 index 0000000000..1bc22af7c5 --- /dev/null +++ b/.github/workflows/composer_template.yml @@ -0,0 +1,72 @@ +name: Tileset composer template + +on: + workflow_call: + inputs: + tileset: + type: string + required: true + composer-args: + type: string + required: true + +env: + BUILD_DIR: build + TILESET: ${{ inputs.tileset }} + COMPOSE_ARGS: ${{ inputs.composer-args }} + +jobs: + build: + name: CI Build + runs-on: ubuntu-latest + steps: + - name: Install Dependencies + uses: awalsh128/cache-apt-pkgs-action@v1 + with: + packages: musl python3 python3-pip libvips42 + + - run: sudo apt-get update; sudo apt-get install libvips42 + - run: pip3 install pyvips + + - uses: actions/checkout@v3 + + - name: Build + id: build + run: | + mkdir "$BUILD_DIR" + wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py + + python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" + [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" + + artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" + + mkdir "$artifact_name" + mv "${BUILD_DIR}"/*.png "$artifact_name" + cp "$BUILD_DIR/tile_config.json" "$artifact_name" + cp "gfx/$TILESET/tileset.txt" "$artifact_name" + + echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT + + - name: Upload Artifacts + uses: actions/upload-artifact@v3.1.2 + with: + name: ${{ steps.build.outputs.ARTIFACT-NAME }} + path: ${{ steps.build.outputs.ARTIFACT-NAME }} + + - name: Compare IDs with ${{ github.base_ref }} + id: compare + if: github.base_ref + run: | + echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" + git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} + git checkout origin/${{ github.base_ref }} + + mkdir "$BUILD_DIR/base_json/" + python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" + + wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ + || echo "Error: Failed to get list_tileset_ids.py" + + echo -e "\nDifferences in IDs:" + (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 diff --git a/.github/workflows/giantdays_ci_build.yml b/.github/workflows/giantdays_ci_build.yml index 2f41da0c8d..e2962899a3 100644 --- a/.github/workflows/giantdays_ci_build.yml +++ b/.github/workflows/giantdays_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggerd by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/RetroDays folder name: GiantDays composer -env: - TILESET: GiantDays - COMPOSE_ARGS: --use-all - BUILD_DIR: build - on: push: branches: @@ -27,60 +16,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: GiantDays + composer-args: --use-all diff --git a/.github/workflows/hm_build.yml b/.github/workflows/hm_build.yml index b5d0347326..2550898654 100644 --- a/.github/workflows/hm_build.yml +++ b/.github/workflows/hm_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggered by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/HollowMoon folder name: HollowMoon composer -env: - TILESET: HollowMoon - COMPOSE_ARGS: --use-all --obsolete-fillers - BUILD_DIR: build - on: push: branches: @@ -27,60 +16,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: HollowMoon + composer-args: --use-all --obsolete-fillers diff --git a/.github/workflows/isomsx_ci_build.yml b/.github/workflows/isomsx_ci_build.yml index 7d47c89b69..4b751ee87c 100644 --- a/.github/workflows/isomsx_ci_build.yml +++ b/.github/workflows/isomsx_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggered by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/IsoMSX+ folder name: IsoMSX+ composer -env: - TILESET: IsoMSX+ - COMPOSE_ARGS: --use-all - BUILD_DIR: build - on: push: branches: @@ -27,60 +16,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: IsoMSX+ + composer-args: --use-all diff --git a/.github/workflows/msx_ci_build.yml b/.github/workflows/msx_ci_build.yml index 641bc2e5a6..51fc17273f 100644 --- a/.github/workflows/msx_ci_build.yml +++ b/.github/workflows/msx_ci_build.yml @@ -1,16 +1,5 @@ -# performs CI builds using compose.py from -# https://github.com/CleverRaven/Cataclysm-DDA -# -# This action is triggered by any PR against the master branch as well -# as on any push to the master branch itself -# that changes any file in gfx/MShockXotto+ folder name: MShockXotto+ composer -env: - TILESET: MShockXotto+ - COMPOSE_ARGS: --use-all - BUILD_DIR: build - on: push: branches: @@ -27,61 +16,7 @@ on: jobs: build: - name: CI Build - runs-on: ubuntu-latest - steps: - - name: Install Dependencies - uses: awalsh128/cache-apt-pkgs-action@v1 - with: - packages: musl python3 python3-pip libvips42 - - # re-installing libvips; caching it won't set it up the way we need it - # still cache it because we'll make it work somehow - - run: sudo apt-get update; sudo apt-get install libvips42 - - run: pip3 install pyvips - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build - id: build - run: | - mkdir "$BUILD_DIR" - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \ - || echo "Error: Failed to get compose.py" - - python3 "$BUILD_DIR/compose.py" --feedback CONCISE --loglevel INFO $COMPOSE_ARGS "gfx/$TILESET" "$BUILD_DIR" - [ -f "gfx/$TILESET/fallback.png" ] && cp "gfx/$TILESET/fallback.png" "$BUILD_DIR/" - - artifact_name="$TILESET-dev-git-${GITHUB_SHA::7}" - - mkdir "$artifact_name" - mv "${BUILD_DIR}"/*.png "$artifact_name" - cp "$BUILD_DIR/tile_config.json" "$artifact_name" - cp "gfx/$TILESET/tileset.txt" "$artifact_name" - cp "gfx/$TILESET/layering.json" "$artifact_name" - - echo "ARTIFACT-NAME=$artifact_name" >> $GITHUB_OUTPUT - - - name: Upload Artifacts - uses: actions/upload-artifact@v3.1.2 - with: - name: ${{ steps.build.outputs.ARTIFACT-NAME }} - path: ${{ steps.build.outputs.ARTIFACT-NAME }} - - - name: Compare IDs with ${{ github.base_ref }} - id: compare - if: github.base_ref - run: | - echo "Switching to the target branch ${{ github.base_ref }} to get differences between ID lists" - git fetch --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.base_ref }} - git checkout origin/${{ github.base_ref }} - - mkdir "$BUILD_DIR/base_json/" - python3 "$BUILD_DIR/compose.py" $COMPOSE_ARGS --only-json "gfx/$TILESET" "$BUILD_DIR/base_json/" - - wget -q -P "$BUILD_DIR" https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/list_tileset_ids.py \ - || echo "Error: Failed to get list_tileset_ids.py" - - echo -e "\nDifferences in IDs:" - (diff -u0 <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/base_json/") <(python3 "$BUILD_DIR/list_tileset_ids.py" "$BUILD_DIR/")) | tail -n +3 + uses: ./.github/workflows/composer_template.yml + with: + tileset: MShockXotto+ + composer-args: --use-all