diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 6467054d..0ac56bb7 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -57,7 +57,7 @@ jobs: sudo apt-get install -y debsigs bash ./scripts/sign.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: ${{ contains(matrix.packages.available-flavors, env.FB_PACKAGE_NAME) }} with: name: ${{ env.FB_PACKAGE_NAME }}_${{ env.VERSION }}_rpm @@ -100,7 +100,7 @@ jobs: sudo apt-get install -y debsigs bash ./scripts/sign.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: ${{ contains(matrix.packages.available-flavors, env.FB_PACKAGE_NAME) }} with: name: ${{ env.FB_PACKAGE_NAME }}_${{ env.VERSION }}_deb @@ -128,7 +128,7 @@ jobs: unzip fluent-bit-${{ env.VERSION }}-${{ matrix.packages.version }}.zip zip -r -j packages/fb-windows-${{ matrix.packages.arch }}.zip fluent-bit-${{ env.VERSION }}-${{ matrix.packages.version }}/bin/fluent-bit.exe fluent-bit-${{ env.VERSION }}-${{ matrix.packages.version }}/bin/fluent-bit.dll - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: fluent-bit_${{ env.VERSION }}_zip path: packages/ diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 885bcf19..dff9783b 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -119,7 +119,7 @@ jobs: # for those distros using the same package, such as Windows). To avoid this, we first push all the files to a # shared filesystem and let the "prepare_prerelease" step below upload them later, sequentially. This GH action # ensures that if two jobs attempt pushing the same file, they get overwritten (last one prevails). - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: # Artifacts are pushed to *shared network folders* that have this name and that contain # the artifact inside of them. Example: fluent-bit-2.1.8-386.exe/fluent-bit-2.1.8-386.exe diff --git a/ansible/build-fb-suse/playbook.yml b/ansible/build-fb-suse/playbook.yml index 8e40b82d..b7248780 100644 --- a/ansible/build-fb-suse/playbook.yml +++ b/ansible/build-fb-suse/playbook.yml @@ -38,6 +38,23 @@ tasks: - name: Wait for connection to be available wait_for_connection: + - name: Debug repository configuration + command: zypper repos + register: repo_output + ignore_errors: yes + + - name: Print repository configuration + debug: + var: repo_output.stdout_lines + + - name: Refresh repositories + command: zypper refresh + register: refresh_output + ignore_errors: yes + + - name: Print refresh output + debug: + var: refresh_output.stdout_lines - name: Install dependencies community.general.zypper: @@ -58,9 +75,30 @@ become: true register: install_status until: install_status is success - # Retry up to 5 minutes, because at startup the zypper command might temporarily hold a lock that prevents installing packages delay: 15 retries: 20 + # - name: Install dependencies + # community.general.zypper: + # name: + # - git + # - flex + # - wget + # - libyaml-devel + # - libopenssl-devel + # - systemd-devel + # - gcc + # - gcc-c++ + # - rpmbuild + # - "{{ cpp_with_version }}" + # state: present + # oldpackage: true + # force_resolution: true + # become: true + # register: install_status + # until: install_status is success + # # Retry up to 5 minutes, because at startup the zypper command might temporarily hold a lock that prevents installing packages + # delay: 15 + # retries: 20 - name: Download and extract Bison {{ bison_version }} unarchive: diff --git a/versions/common.yml b/versions/common.yml index 7ea346f0..4e9c69e8 100644 --- a/versions/common.yml +++ b/versions/common.yml @@ -1,4 +1,5 @@ -fbVersion: 3.1.2 +#fluent bit version +fbVersion: 3.1.9 # This file, together with each distro file are processed and merged incrementally to # build all the information required to download and test each package. Each package ends