Skip to content

Commit 5eded9a

Browse files
bolshakovbolshakov
committed
Merge branch 'release/v5.3.0'
2 parents ffe26ed + b61de67 commit 5eded9a

File tree

6 files changed

+113
-53
lines changed

6 files changed

+113
-53
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
push:
66
branches: [ master ]
77

8+
permissions: # added using https://github.com/step-security/secure-repo
9+
contents: read
10+
811
jobs:
912
rubocop:
1013
name: Standard 👮
@@ -13,10 +16,15 @@ jobs:
1316
checks: write
1417
contents: read
1518
steps:
19+
- name: Harden the runner (Audit all outbound calls)
20+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
21+
with:
22+
egress-policy: audit
23+
1624
- name: Checkout code
17-
uses: actions/checkout@v4
25+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1826
- name: Standard Ruby
19-
uses: "standardrb/standard-ruby-action@v1"
27+
uses: standardrb/standard-ruby-action@eecb3f730879f5b8830705348c2961e5aa26de78 # v1.5.0
2028
with:
2129
autofix: false
2230

@@ -37,11 +45,16 @@ jobs:
3745
ports:
3846
- 6379:6379
3947
steps:
48+
- name: Harden the runner (Audit all outbound calls)
49+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
50+
with:
51+
egress-policy: audit
52+
4053
- name: Checkout code
41-
uses: actions/checkout@v4
54+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4255

4356
- name: Set up Ruby
44-
uses: ruby/setup-ruby@v1
57+
uses: ruby/setup-ruby@bb6434c747fa7022e12fa1cae2a0951fcffcff26 # v1.253.0
4558
with:
4659
ruby-version: 3.3.4
4760
bundler-cache: true
@@ -54,6 +67,9 @@ jobs:
5467
CUCUMBER_PUBLISH_ENABLED: true
5568

5669
spec:
70+
permissions:
71+
checks: write # for coverallsapp/github-action to create new checks
72+
contents: read # for actions/checkout to fetch code
5773
name: Specs on Ruby ${{ matrix.ruby }} with Redis ${{ matrix.redis }} 💚
5874
runs-on: ubuntu-latest
5975
strategy:
@@ -71,11 +87,16 @@ jobs:
7187
ports:
7288
- 6379:6379
7389
steps:
90+
- name: Harden the runner (Audit all outbound calls)
91+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
92+
with:
93+
egress-policy: audit
94+
7495
- name: Checkout code
75-
uses: actions/checkout@v4
96+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7697

7798
- name: Set up Ruby
78-
uses: ruby/setup-ruby@v1
99+
uses: ruby/setup-ruby@bb6434c747fa7022e12fa1cae2a0951fcffcff26 # v1.253.0
79100
with:
80101
ruby-version: ${{ matrix.ruby }}
81102
bundler-cache: true
@@ -85,17 +106,24 @@ jobs:
85106
env:
86107
STOPLIGHT_REDIS_URL: "redis://127.0.0.1:6379/0"
87108
- name: Coveralls
88-
uses: coverallsapp/github-action@v1.1.2
109+
uses: coverallsapp/github-action@8cbef1dea373ebce56de0a14c68d6267baa10b44 # v1.1.2
89110
with:
90111
github-token: ${{ secrets.GITHUB_TOKEN }}
91112
flag-name: ruby-${{ matrix.ruby }}
92113
parallel: true
93114
finish:
115+
permissions:
116+
checks: write # for coverallsapp/github-action to create new checks
94117
needs: spec
95118
runs-on: ubuntu-latest
96119
steps:
120+
- name: Harden the runner (Audit all outbound calls)
121+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
122+
with:
123+
egress-policy: audit
124+
97125
- name: Coveralls Finished
98-
uses: coverallsapp/github-action@master
126+
uses: coverallsapp/github-action@09b709cf6a16e30b0808ba050c7a6e8a5ef13f8d # master
99127
with:
100128
github-token: ${{ secrets.GITHUB_TOKEN }}
101129
parallel-finished: true

‎.github/workflows/docker-build.yml‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎.github/workflows/release.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: Release 🚀
2+
on:
3+
release:
4+
types: [published]
5+
6+
env:
7+
version: ${{ github.event.release.tag_name }}
8+
docker_username: ${{ secrets.DOCKER_HUB_USERNAME }}
9+
docker_password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
10+
11+
permissions: # added using https://github.com/step-security/secure-repo
12+
contents: read
13+
14+
jobs:
15+
gem:
16+
name: Ruby Gem 📦
17+
runs-on: ubuntu-latest
18+
environment: releases
19+
steps:
20+
- name: Harden the runner (Audit all outbound calls)
21+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
22+
with:
23+
egress-policy: audit
24+
25+
- name: Checkout code
26+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
27+
28+
- name: Set up Ruby
29+
uses: ruby/setup-ruby@bb6434c747fa7022e12fa1cae2a0951fcffcff26 # v1.253.0
30+
with:
31+
bundler-cache: true
32+
ruby-version: ruby
33+
34+
- name: Release Gem
35+
uses: rubygems/release-gem@ebe1ec66bd8d2c709ac29aa2b43438d450e7a0a6 # v1
36+
37+
docker:
38+
name: Docker Image 🐳
39+
depends-on: gem
40+
runs-on: ubuntu-latest
41+
environment: releases
42+
steps:
43+
- name: Harden the runner (Audit all outbound calls)
44+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
45+
with:
46+
egress-policy: audit
47+
48+
- name: Checkout Repository
49+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
50+
- uses: docker/setup-buildx-action@885d1462b80bc1c1c7f0b00334ad271f09369c55 # v2.10.0
51+
- name: Checkout release
52+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
53+
with:
54+
ref: refs/tags/${{ env.version }}
55+
- name: Login to Docker Hub
56+
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
57+
with:
58+
username: ${{ env.docker_username }}
59+
password: ${{ env.docker_password }}
60+
- name: Build and push
61+
uses: docker/build-push-action@0a97817b6ade9f46837855d676c4cca3a2471fc9 # v4.2.1
62+
with:
63+
push: true
64+
tags: |
65+
bolshakov/stoplight-admin:${{ env.version }}
66+
bolshakov/stoplight-admin:latest
67+
platforms: linux/amd64, linux/arm64
68+
context: .
69+
file: Dockerfile

‎Gemfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
stoplight (5.2.0)
4+
stoplight (5.3.0)
55
zeitwerk
66

77
GEM
@@ -112,7 +112,7 @@ GEM
112112
mustermann (3.0.3)
113113
ruby2_keywords (~> 0.0.1)
114114
nio4r (2.7.4)
115-
nokogiri (1.18.8)
115+
nokogiri (1.18.9)
116116
mini_portile2 (~> 2.8.2)
117117
racc (~> 1.4)
118118
parallel (1.27.0)
@@ -162,9 +162,9 @@ GEM
162162
rdoc (6.14.1)
163163
erb
164164
psych (>= 4.0.0)
165-
redis (5.4.0)
165+
redis (5.4.1)
166166
redis-client (>= 0.22.0)
167-
redis-client (0.24.0)
167+
redis-client (0.25.1)
168168
connection_pool
169169
regexp_parser (2.10.0)
170170
reline (0.6.1)
@@ -248,7 +248,7 @@ GEM
248248
stringio (3.1.7)
249249
sys-uname (1.3.1)
250250
ffi (~> 1.1)
251-
thor (1.3.2)
251+
thor (1.4.0)
252252
tilt (2.6.0)
253253
timecop (0.9.10)
254254
tzinfo (2.0.6)

‎SECURITY.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ You can expect to receive security fixes for the latest minor version only.
66

77
| Version | Supported |
88
|---------| ------------------ |
9-
| 5.2.x | :white_check_mark: |
10-
| < 5.2 | :x: |
9+
| 5.3.x | :white_check_mark: |
10+
| < 5.3 | :x: |
1111

1212
## Reporting a Vulnerability
1313

‎lib/stoplight/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module Stoplight
4-
VERSION = Gem::Version.new("5.2.0")
4+
VERSION = Gem::Version.new("5.3.0")
55
end

0 commit comments

Comments
 (0)