From 02c6ac4787bb6994a047a6f07e0ab0bd0f962775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 5 Jan 2022 13:12:43 +0100 Subject: [PATCH 1/2] [CI] Pinned lzf to version 1.6.8 (#3132) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f8846bdb0f..41cf81b4d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ before_install: - echo "default_charset=UTF-8" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini # Install igbinary & lzf PHP extensions if necessary - if [ "$REDIS_ENABLE_IGBINARY" = true ] ; then pecl install igbinary ; fi - - if [ "$REDIS_ENABLE_LZF" = true ] ; then printf "no\n" | pecl install lzf ; fi + - if [ "$REDIS_ENABLE_LZF" = true ] ; then printf "no\n" | pecl install lzf-1.6.8 ; fi # Prepare system - if [ "$TEST_CONFIG" != "" ] ; then ./bin/.travis/prepare_unittest.sh ; fi - if [ "$BEHAT_OPTS" != "" ] ; then ./bin/.travis/enable_swap.sh ; fi From 29435e74a97490b09870dc2da01506e1073ceaf2 Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi <67897517+ibexa-yuna@users.noreply.github.com> Date: Mon, 10 Jan 2022 08:58:25 +0100 Subject: [PATCH 2/2] IBX-1734: Added cross-org merge workflow (#280) --- .github/workflows/cross-merge.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/cross-merge.yaml diff --git a/.github/workflows/cross-merge.yaml b/.github/workflows/cross-merge.yaml new file mode 100644 index 0000000000..41c5df1e03 --- /dev/null +++ b/.github/workflows/cross-merge.yaml @@ -0,0 +1,12 @@ +name: Ibexa Reusable / Cross Org PR + +on: + push: + branches-ignore: + - "temp_*" + +jobs: + call: + uses: ibexa/gh-workflows/.github/workflows/cross-merge.yml@main + secrets: + robot-token: ${{ secrets.EZROBOT_PAT }}