Skip to content

chore(debt): Backport upstream changes - #39

Merged
aurelien-reeves-scalingo merged 32 commits into
masterfrom
chore/dept/backport-upstream-changes
Jul 13, 2026
Merged

chore(debt): Backport upstream changes#39
aurelien-reeves-scalingo merged 32 commits into
masterfrom
chore/dept/backport-upstream-changes

Conversation

@aurelien-reeves-scalingo

Copy link
Copy Markdown

ref #32
ref #34
ref #35
ref #38

Comment thread spec/support/tls_certs/nsq-server-key.pem
Comment thread spec/support/tls_certs/nsq-client-key.pem
Comment thread spec/support/tls_certs/nsq-ca-key.pem
Comment thread spec/support/tls_certs/nsq-server-key.pem
Comment thread spec/support/tls_certs/nsq-client-key.pem
Comment thread spec/support/tls_certs/nsq-ca-key.pem
Comment thread spec/support/tls_certs/nsq-server-key.pem
Comment thread spec/support/tls_certs/nsq-client-key.pem
Comment thread spec/support/tls_certs/nsq-ca-key.pem
@aurelien-reeves-scalingo

Copy link
Copy Markdown
Author

Tests seems to be very flaky
But in the end, they are passing

@aurelien-reeves-scalingo
aurelien-reeves-scalingo marked this pull request as ready for review June 29, 2026 09:33
@notion-workspace

Copy link
Copy Markdown

@aurelien-reeves-scalingo

Copy link
Copy Markdown
Author

before merging to master, maybe we want our client to rely on a tag rather than on master branch!?

@aurelien-reeves-scalingo

aurelien-reeves-scalingo commented Jul 7, 2026

Copy link
Copy Markdown
Author

ping @leo-scalingo
(dunno if you noticed the notification as you were off ;))

@leo-scalingo leo-scalingo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The logics which is changed here seems good to me

dependabot Bot and others added 12 commits July 13, 2026 16:01
Bumps [rack](https://github.com/rack/rack) from 2.2.4 to 2.2.6.2.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](rack/rack@2.2.4...v2.2.6.2)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.9 to 1.14.0.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.13.9...v1.14.0)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [rack](https://github.com/rack/rack) from 2.2.6.2 to 2.2.6.3.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](rack/rack@v2.2.6.2...v2.2.6.3)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [rack](https://github.com/rack/rack) from 2.2.6.3 to 2.2.6.4.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](rack/rack@v2.2.6.3...v2.2.6.4)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.14.0 to 1.14.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.14.0...v1.14.3)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [nsq-cluster](https://github.com/wistia/nsq-cluster) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/wistia/nsq-cluster/releases)
- [Changelog](https://github.com/wistia/nsq-cluster/blob/master/CHANGELOG.md)
- [Commits](wistia/nsq-cluster@v2.1.0...v2.2.0)

---
updated-dependencies:
- dependency-name: nsq-cluster
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.14.3 to 1.16.2.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.14.3...v1.16.2)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
EtienneM and others added 19 commits July 13, 2026 16:01
Commit reword for signing requirement
Commit reworded for signature requirement
…a#66)

* Update Gemfile + gemspec

* Remove jeweler gem

* Use VERSION file

* Update Gemfile.lock

* Add GHA workflow to run tests against several ruby versions

* Update certs so openSSL stops complaining

* Remove old .ruby-version and .travis.yml + add .tool-versions

Reworded for signature requirement
reworded for signature requirement
reworded for signature requirement
reworded for signature requirement
* Update CHANGELOG.md

* Bump VERSION to 2.4.0

Reworded for signature requirement
Co-authored-by: wistia-gha-security-bot[bot] <275146629+wistia-gha-security-bot[bot]@users.noreply.github.com>
* GHA/run-tests: Bump ruby/nsq versions

* Bump Gemfile.lock

* Add logger dependency in Gemfile for Ruby 4.0 compatibility
@aurelien-reeves-scalingo
aurelien-reeves-scalingo force-pushed the chore/dept/backport-upstream-changes branch from 4b6239f to c12faf0 Compare July 13, 2026 14:07
Comment thread .github/dependabot.yml
Comment on lines +12 to +17
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
reviewers:
- "leo-scalingo"

@semgrep-code-scalingo semgrep-code-scalingo Bot Jul 13, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This Dependabot configuration does not set a cooldown period. Newly published packages can be malicious or unstable. Add a cooldown block with default-days: 7 to each package-ecosystem entry under updates to wait 7 days before proposing updates to newly published package versions. Reference: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#cooldown

🧼 Removed in commit 72ede13 🧼

runs-on: ubuntu-24.04
steps:
- name: Automatically merge Dependabot PRs
uses: Scalingo/actions/dependabot-automerge@main

@semgrep-code-scalingo semgrep-code-scalingo Bot Jul 13, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

GitHub Actions step uses a mutable tag or branch reference. Tags and branch names can be silently repointed by the action owner, enabling supply-chain attacks — as seen in the trivy-action and kics-github-action compromises. Pin the reference to a full 40-character commit SHA instead, e.g. uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608.

🥳 Removed in commit 72ede13 🥳

@semgrep-code-scalingo

Copy link
Copy Markdown

Semgrep found 1 dependabot-missing-cooldown finding:

This Dependabot configuration does not set a cooldown period. Newly published packages can be malicious or unstable. Add a cooldown block with default-days: 7 to each package-ecosystem entry under updates to wait 7 days before proposing updates to newly published package versions. Reference: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#cooldown

@aurelien-reeves-scalingo
aurelien-reeves-scalingo merged commit ff313cd into master Jul 13, 2026
11 of 14 checks passed
@aurelien-reeves-scalingo
aurelien-reeves-scalingo deleted the chore/dept/backport-upstream-changes branch July 13, 2026 14:17
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.

7 participants