Skip to content

deb rpm: fix local dependency gem#688

Merged
daipom merged 2 commits into
fluent:feature-nodowntimefrom
kenhys:fix-local-dependency-gem
Nov 1, 2024
Merged

deb rpm: fix local dependency gem#688
daipom merged 2 commits into
fluent:feature-nodowntimefrom
kenhys:fix-local-dependency-gem

Conversation

@kenhys

@kenhys kenhys commented Oct 18, 2024

Copy link
Copy Markdown
Contributor

Before:

  • missing fluent-plugin was installed

After:

  • missing fluent-plugin was installed
  • missing dependency gem was also installed

NOTE:

  • if missing gem requires development packages to build it, it will
    fail.
  • fluent-diagtool depends on highly systemd service, so it is simple
    just to use fluent-gem detecting missing gems.

@kenhys
kenhys force-pushed the fix-local-dependency-gem branch 3 times, most recently from fda97f6 to 73a9d59 Compare October 18, 2024 07:19
@kenhys
kenhys marked this pull request as ready for review October 18, 2024 07:19
@kenhys kenhys changed the title WIP: Fix local dependency gem deb rpm: fix local dependency gem Oct 18, 2024
@kenhys
kenhys force-pushed the fix-local-dependency-gem branch 10 times, most recently from e3d2b34 to 930444b Compare October 21, 2024 05:46
@kenhys

kenhys commented Oct 21, 2024

Copy link
Copy Markdown
Contributor Author

service restart may need some more tweaks in rpm CI, but it is out of this PR.

@kenhys
kenhys requested review from Watson1978 and daipom October 21, 2024 06:39
@kenhys
kenhys force-pushed the fix-local-dependency-gem branch from 930444b to 04d8157 Compare October 21, 2024 06:42
@kenhys

kenhys commented Oct 22, 2024

Copy link
Copy Markdown
Contributor Author

TODO: add missing test case

@kenhys
kenhys force-pushed the fix-local-dependency-gem branch 5 times, most recently from 2e71072 to 18bafd1 Compare October 22, 2024 02:55
Comment thread .github/workflows/apt.yml Outdated
@kenhys
kenhys force-pushed the fix-local-dependency-gem branch from 18bafd1 to 5dfe5c2 Compare October 22, 2024 03:07
Comment thread .github/workflows/apt.yml Outdated
@kenhys
kenhys force-pushed the fix-local-dependency-gem branch 2 times, most recently from 54e397f to f264999 Compare October 22, 2024 05:29
@kenhys
kenhys force-pushed the fix-local-dependency-gem branch from 0ea2ce3 to 7cd0738 Compare October 30, 2024 07:48
@kenhys

kenhys commented Oct 30, 2024

Copy link
Copy Markdown
Contributor Author

Fixed typo in postinst

@kenhys
kenhys force-pushed the feature-nodowntime branch from 57df978 to 4199d11 Compare October 31, 2024 01:56
@kenhys
kenhys force-pushed the fix-local-dependency-gem branch from 7cd0738 to b71b070 Compare October 31, 2024 02:04
@kenhys

kenhys commented Oct 31, 2024

Copy link
Copy Markdown
Contributor Author

rebased with recent feature branch.

Comment thread fluent-package/yum/fluent-package.spec.in Outdated
@daipom

daipom commented Oct 31, 2024

Copy link
Copy Markdown
Contributor

Let's cache v6 dummy
(We need to remove existing cache once though)

      - name: cache deb
        uses: actions/cache@v4
        id: cache-deb
        with:
          path: |
            fluent-package/apt/repositories
            fluent-apt-source/apt/repositories
            fluent-lts-apt-source/apt/repositories
+            v6-test/fluent-package/apt/repositories
          key: ${{ runner.os }}-cache-${{ matrix.rake-job }}-${{ hashFiles('**/config.rb', '**/Rakefile', '**/Gemfile*', 'fluent-package/templates/**', 'fluent-package/debian/**', 'fluent-package/apt/**/Dockerfile') }}
      - name: Build deb with Docker
        if: ${{ ! steps.cache-deb.outputs.cache-hit }}
        run: |
          rake apt:build APT_TARGETS=${{ matrix.rake-job }}
      - uses: actions/checkout@master
+        if: ${{ ! steps.cache-deb.outputs.cache-hit }}
        with:
          path: v6-test
      - name: Build v6 deb with Docker
+        if: ${{ ! steps.cache-deb.outputs.cache-hit }}
        run: |
          cd v6-test
          git config user.email "fluentd@googlegroups.com"
          git config user.name "Fluentd developers"
          git am fluent-package/bump-version-v6.patch
          rake apt:build APT_TARGETS=${{ matrix.rake-job }}

@kenhys
kenhys force-pushed the fix-local-dependency-gem branch 2 times, most recently from e05447b to 7fe1eed Compare October 31, 2024 07:39
@kenhys

kenhys commented Oct 31, 2024

Copy link
Copy Markdown
Contributor Author

Fixed not matched local_missing_plugins.

Comment thread fluent-package/templates/package-scripts/fluent-package/deb/postinst Outdated
@kenhys
kenhys force-pushed the fix-local-dependency-gem branch 2 times, most recently from d59be52 to a04c249 Compare October 31, 2024 08:07
Comment thread fluent-package/templates/package-scripts/fluent-package/deb/postinst Outdated
@kenhys
kenhys force-pushed the fix-local-dependency-gem branch from 2f243d3 to ba84806 Compare October 31, 2024 08:14
Comment thread fluent-package/templates/package-scripts/fluent-package/deb/postinst Outdated
@kenhys
kenhys force-pushed the fix-local-dependency-gem branch from ba84806 to d94cdb3 Compare October 31, 2024 09:04
@kenhys

kenhys commented Oct 31, 2024

Copy link
Copy Markdown
Contributor Author

resolved conflict.

@kenhys
kenhys force-pushed the fix-local-dependency-gem branch 2 times, most recently from e6a4c01 to 4e11674 Compare October 31, 2024 09:24
Comment thread fluent-package/yum/fluent-package.spec.in Outdated
Before:

* missing fluent-plugin was installed

After:

* missing fluent-plugin was installed
* missing dependency gem was also installed

NOTE:

* if missing gem requires development packages to build it, it will
fail.
* fluent-diagtool depends on highly systemd service, so it is simple
just to use fluent-gem detecting missing gems.

Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
When major upgrade process was executed, manually installed plugin/gem
should be installed in advance.

This PR test whether that mechanism will be launched.

Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
@kenhys
kenhys force-pushed the fix-local-dependency-gem branch from 7bbf81d to 55dd93d Compare November 1, 2024 03:18
@kenhys

kenhys commented Nov 1, 2024

Copy link
Copy Markdown
Contributor Author

NOTE:

  • win: should be fixed build failure in another PR.
  • deb: service issue should be fixed in another PR.

@daipom daipom left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks!!

@daipom daipom closed this Nov 1, 2024
@daipom daipom reopened this Nov 1, 2024
@daipom
daipom merged commit 7968206 into fluent:feature-nodowntime Nov 1, 2024
@daipom

daipom commented Nov 1, 2024

Copy link
Copy Markdown
Contributor

(ボタン押し間違えました 🙇 )

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants