diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 607f1d574e..b141f08a2a 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -82,7 +82,7 @@ jobs: cd .. fi - for repo_path in $(jq --raw-output 'keys | .[]' repo.json); do + for repo_path in $(jq --raw-output 'del(.pkg_format) | keys | .[]' repo.json); do repo=$(jq --raw-output '.["'${repo_path}'"].name' repo.json) # Parse changed files and identify new packages and deleted packages. # Create lists of those packages that will be passed to upload job for @@ -117,7 +117,7 @@ jobs: done else for pkg in ${{ github.event.inputs.packages }}; do - repo_paths=$(jq --raw-output 'keys | .[]' repo.json) + repo_paths=$(jq --raw-output 'del(.pkg_format) | keys | .[]' repo.json) found=false for repo_path in $repo_paths; do repo=$(jq --raw-output '.["'${repo_path}'"].name' repo.json) @@ -136,7 +136,7 @@ jobs: done fi - for repo in $(jq --raw-output '.[].name' repo.json); do + for repo in $(jq --raw-output 'del(.pkg_format) | .[].name' repo.json); do # Fix so that lists do not contain duplicates if [ -f ./built_${repo}_packages.txt ]; then uniq ./built_${repo}_packages.txt > ./built_${repo}_packages.txt.tmp @@ -166,7 +166,7 @@ jobs: - name: Lint packages run: | declare -a package_recipes - for repo_path in $(jq --raw-output 'keys | .[]' repo.json); do + for repo_path in $(jq --raw-output 'del(.pkg_format) | keys | .[]' repo.json); do repo=$(jq --raw-output '.["'${repo_path}'"].name' repo.json) if [ -f ./built_${repo}_packages.txt ]; then package_recipes="$package_recipes $(cat ./built_${repo}_packages.txt | repo_path=${repo_path} awk '{print ENVIRON["repo_path"]"/"$1"/build.sh"}')" @@ -180,7 +180,7 @@ jobs: - name: Build packages run: | declare -a packages - for repo_path in $(jq --raw-output 'keys | .[]' repo.json); do + for repo_path in $(jq --raw-output 'del(.pkg_format) | keys | .[]' repo.json); do repo=$(jq --raw-output '.["'${repo_path}'"].name' repo.json) if [ -f ./built_${repo}_packages.txt ]; then @@ -197,7 +197,7 @@ jobs: run: | test -d termux-packages/output && mv termux-packages/output/* ./output/ - for repo in $(jq --raw-output '.[].name' repo.json); do + for repo in $(jq --raw-output 'del(.pkg_format) | .[].name' repo.json); do # Put package lists into directory with *.pkg.* files so they will be transferred to # upload job. test -f ./built_${repo}_packages.txt && mv ./built_${repo}_packages.txt ./pkgs/ @@ -265,7 +265,7 @@ jobs: } archive="pkgs-${{ matrix.arch }}-${{ github.sha }}/pkgs-${{ matrix.arch }}-${{ github.sha }}.tar" tar xf "$archive" - for repo in $(jq --raw-output '.[].name' repo.json); do + for repo in $(jq --raw-output 'del(.pkg_format) | .[].name' repo.json); do dp_file="deleted_${repo}_packages.txt" if [[ -f pkgs/$dp_file ]]; then path_dp_file=pkgs/${{ github.sha }}_${dp_file} diff --git a/packages/flyctl/build.sh b/packages/flyctl/build.sh index 69b75dcda6..01e4ad34d0 100644 --- a/packages/flyctl/build.sh +++ b/packages/flyctl/build.sh @@ -26,3 +26,4 @@ termux_step_make() { termux_step_make_install() { install -Dm700 -t "$TERMUX_PREFIX"/bin "$TERMUX_PKG_SRCDIR/bin/flyctl" } + diff --git a/packages/libnss/build.sh b/packages/libnss/build.sh index 125976dfb8..3d8c9aa06a 100644 --- a/packages/libnss/build.sh +++ b/packages/libnss/build.sh @@ -97,3 +97,4 @@ termux_step_create_debscripts() { echo "exit 0" >> postinst chmod 0755 postinst } + diff --git a/packages/mu/build.sh b/packages/mu/build.sh index 364b543663..0be6269efd 100644 --- a/packages/mu/build.sh +++ b/packages/mu/build.sh @@ -22,3 +22,4 @@ termux_step_create_debscripts() { rm -f $TERMUX_PREFIX/share/emacs/site-lisp/mu4e/*.elc EOF } + diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh index e92011b725..d1331c22ad 100644 --- a/packages/vim-python/build.sh +++ b/packages/vim-python/build.sh @@ -106,3 +106,4 @@ termux_step_create_debscripts() { fi EOF } + diff --git a/packages/vim/build.sh b/packages/vim/build.sh index e6f4b6fe9b..4346d36bd0 100644 --- a/packages/vim/build.sh +++ b/packages/vim/build.sh @@ -94,3 +94,4 @@ termux_step_create_debscripts() { fi EOF } + diff --git a/x11-packages/firefox/build.sh b/x11-packages/firefox/build.sh index b6e0b286ce..e5dba438c2 100644 --- a/x11-packages/firefox/build.sh +++ b/x11-packages/firefox/build.sh @@ -84,3 +84,4 @@ termux_step_configure() { termux_step_post_make_install() { install -Dm600 $TERMUX_PKG_BUILDER_DIR/firefox.desktop $TERMUX_PREFIX/share/applications/firefox.desktop } + diff --git a/x11-packages/vim-gtk/build.sh b/x11-packages/vim-gtk/build.sh index f4569e915a..fb267e8cc4 100644 --- a/x11-packages/vim-gtk/build.sh +++ b/x11-packages/vim-gtk/build.sh @@ -72,3 +72,4 @@ termux_step_post_make_install() { sed -i "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|g" $TERMUX_PREFIX/share/vim/vimrc ln -sfr $TERMUX_PREFIX/bin/vim $TERMUX_PREFIX/bin/vi } +