Skip to content

Commit e1a4709

Browse files
committed
reset a lot of mess
1 parent 6e7f203 commit e1a4709

File tree

141 files changed

+1139
-1627
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+1139
-1627
lines changed

.github/workflows/continuous-delivery.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
stage: ${{ steps.get_metadata.outputs.stage }}
4242
steps:
4343
- name: Checkout code
44-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
44+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4545

4646
- name: Get metadata
4747
id: get_metadata
@@ -86,7 +86,7 @@ jobs:
8686
8787
- name: Checkout code
8888
if: fromJSON(needs.metadata.outputs.has_diff)
89-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
89+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
9090

9191
- name: Run merge
9292
if: fromJSON(needs.metadata.outputs.has_diff) || inputs.ignore_metadata_diff
@@ -113,7 +113,6 @@ jobs:
113113
sha: ${{ needs.merge.outputs.sha }}
114114
secrets:
115115
codecov_token: ${{ secrets.CODECOV_TOKEN }}
116-
rails_master_key: ${{ secrets.RAILS_MASTER_KEY }}
117116

118117
publish_image:
119118
name: Publish Image
@@ -144,7 +143,7 @@ jobs:
144143
fi
145144
146145
- name: Checkout code
147-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
146+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
148147
with:
149148
ref: ${{ needs.merge.outputs.sha }}
150149

@@ -156,7 +155,7 @@ jobs:
156155
env: ${{ needs.metadata.outputs.stage }}
157156

158157
- name: Deploy
159-
uses: appleboy/ssh-action@8faa84277b88b6cd1455986f459aa66cf72bc8a3 # v1.2.1
158+
uses: appleboy/ssh-action@2ead5e36573f08b82fbfce1504f1a4b05a647c6f # v1.2.2
160159
env:
161160
STAGE: ${{ needs.metadata.outputs.stage }}
162161
with:
@@ -171,7 +170,7 @@ jobs:
171170
docker-compose up -d
172171
173172
- name: Finalize Sentry release
174-
uses: getsentry/action-release@a74facf8a080ecbdf1cb355f16743530d712abb7 # v1.11.0
173+
uses: getsentry/action-release@128c5058bbbe93c8e02147fe0a9c713f166259a6 # v3.4.0
175174
env:
176175
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
177176
SENTRY_ORG: ${{ vars.SENTRY_ORG_NAME }}

.github/workflows/continuous-integration.yml

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,19 @@ on:
1515
codecov_token:
1616
description: Codecov token
1717
required: true
18-
rails_master_key:
19-
description: The Rails master key
20-
required: true
21-
2218

2319
jobs:
2420
build:
2521
name: Build
2622
runs-on: ubuntu-latest
2723
steps:
2824
- name: Checkout code
29-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3026
with:
3127
ref: ${{ inputs.sha }}
3228

3329
- name: Build test image
34-
uses: guidojw/actions/build-docker-image@3ad963828827110a6b716a011f242bf01fdf1db4 # v1.4.7
30+
uses: guidojw/actions/build-docker-image@93f79307970f9904f178fa99c97bf02f5bc955c9 # v2.0.0
3531
with:
3632
file: Dockerfile
3733
build-args: |
@@ -57,7 +53,7 @@ jobs:
5753
- 5432:5432
5854
steps:
5955
- name: Checkout code
60-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
56+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6157
with:
6258
ref: ${{ inputs.sha }}
6359

@@ -68,29 +64,41 @@ jobs:
6864
6965
- name: Download actionlint
7066
run: |
71-
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.7
67+
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.8
7268
7369
- name: Load test image
74-
uses: guidojw/actions/load-docker-image@3ad963828827110a6b716a011f242bf01fdf1db4 # v1.4.7
70+
uses: guidojw/actions/load-docker-image@93f79307970f9904f178fa99c97bf02f5bc955c9 # v2.0.0
7571
with:
7672
name: app
7773

7874
- name: Lint
79-
env:
80-
RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
8175
run: |
8276
EXIT_STATUS=0
83-
./actionlint -ignore 'SC2153:' -ignore 'property "sha" is not defined in object type {}' || \
77+
./actionlint \
78+
-ignore 'property "gh_app_private_key" is not defined' \
79+
-ignore 'SC2153:' \
80+
-ignore 'property "sha" is not defined in object type {}' || \
81+
EXIT_STATUS=$?
82+
docker run \
83+
-e POSTGRES_USER=postgres \
84+
-e POSTGRES_PASSWORD=postgres \
85+
-e POSTGRES_HOST=localhost \
86+
--network=host \
87+
app bin/ci.sh lint || \
8488
EXIT_STATUS=$?
85-
docker run -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_HOST=localhost -e \
86-
RAILS_MASTER_KEY --network=host app bin/ci.sh lint || EXIT_STATUS=$?
8789
exit $EXIT_STATUS
8890
8991
test:
9092
name: Test
9193
runs-on: ubuntu-latest
9294
needs: build
95+
env:
96+
CAMO_KEY: secret_camo_key
9397
services:
98+
camo:
99+
image: rx14/camo.cr:latest@sha256:5e55c311ea0ca56532aedfa71953bde9e7f4518f3381d413835c87c86a893ca8
100+
env:
101+
PORT: 9090
94102
db:
95103
image: postgres:14.7
96104
env:
@@ -105,7 +113,7 @@ jobs:
105113
- 5432:5432
106114
steps:
107115
- name: Checkout code
108-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
116+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
109117
with:
110118
ref: ${{ inputs.sha }}
111119

@@ -114,28 +122,35 @@ jobs:
114122
echo '::add-matcher::.github/problem-matchers/rspec.json'
115123
116124
- name: Load test image
117-
uses: guidojw/actions/load-docker-image@3ad963828827110a6b716a011f242bf01fdf1db4 # v1.4.7
125+
uses: guidojw/actions/load-docker-image@93f79307970f9904f178fa99c97bf02f5bc955c9 # v2.0.0
118126
with:
119127
name: app
120128

121129
- name: Test
122130
env:
123-
RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
131+
CAMO_HOST: localhost:9090
124132
run: |
125133
mkdir coverage
126-
docker run -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_HOST=localhost -e \
127-
RAILS_MASTER_KEY --network=host -v "$(pwd)"'/coverage:/app/coverage' app bin/ci.sh spec
134+
docker run \
135+
-e CAMO_KEY \
136+
-e CAMO_HOST \
137+
-e POSTGRES_USER=postgres \
138+
-e POSTGRES_PASSWORD=postgres \
139+
-e POSTGRES_HOST=localhost \
140+
--network=host \
141+
-v "$(pwd)"'/coverage:/app/coverage' \
142+
app bin/ci.sh spec
128143
129144
- name: Upload coverage report to Codecov
130145
if: ${{ !cancelled() }}
131-
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
146+
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
132147
with:
133148
fail_ci_if_error: true
134149
token: ${{ secrets.CODECOV_TOKEN }}
135150

136151
- name: Upload coverage report artifact
137152
if: ${{ !cancelled() }}
138-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
153+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
139154
with:
140155
name: coverage
141156
path: coverage/

.github/workflows/publish-image.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,23 @@ jobs:
4848
needs: metadata
4949
steps:
5050
- name: Checkout code
51-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
51+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5252
with:
5353
ref: ${{ inputs.sha }}
5454
fetch-depth: 0
5555

5656
- name: Set up Docker Buildx
57-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
57+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
5858

5959
- name: Login to GitHub Container Registry
60-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
60+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
6161
with:
6262
registry: ${{ vars.DOCKER_REGISTRY_URL }}
6363
username: ${{ github.repository_owner }}
6464
password: ${{ secrets.GITHUB_TOKEN }}
6565

6666
- name: Build and push image
67-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
67+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
6868
with:
6969
push: true
7070
context: .
@@ -77,7 +77,7 @@ jobs:
7777
7878
- name: Create Sentry release
7979
if: ${{ !(github.event_name == 'workflow_dispatch' && github.workflow == 'Publish Image') }}
80-
uses: getsentry/action-release@a74facf8a080ecbdf1cb355f16743530d712abb7 # v1.11.0
80+
uses: getsentry/action-release@128c5058bbbe93c8e02147fe0a9c713f166259a6 # v3.4.0
8181
env:
8282
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
8383
SENTRY_ORG: ${{ vars.SENTRY_ORG_NAME }}

.rubocop.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
require:
2-
- rubocop-factory_bot
3-
- rubocop-rspec_rails
4-
51
plugins:
6-
- rubocop-rspec
2+
- rubocop-factory_bot
73
- rubocop-performance
84
- rubocop-rails
5+
- rubocop-rspec
6+
- rubocop-rspec_rails
97

108
AllCops:
11-
TargetRailsVersion: 7.0
9+
TargetRailsVersion: 7.2
1210
TargetRubyVersion: 3.3
1311
Exclude:
1412
- 'db/schema.rb'
@@ -139,3 +137,6 @@ Lint/StructNewOverride:
139137

140138
Naming/InclusiveLanguage:
141139
Enabled: false
140+
141+
Naming/PredicateMethod:
142+
Enabled: false

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.7
1+
3.4.7

DEPLOY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ We use a continuous development cycle. That means: branch `master` is always in
1212

1313
## Versioning
1414

15-
We do not use versioning in any way. In Slack the last deployed version can be looked up.
15+
We do not use versioning in any way.
1616

1717

1818
## Attaching to remote console

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
FROM ruby:3.3.7-alpine@sha256:6b6a2db6b52015669dcc4b3613c1cfd02f7a74ebbcad98dbe290a814e8ff84e4
2+
FROM ruby:3.4.7-alpine@sha256:cdb113e8110f2ed8c5e2e1ef4b02494e0243f8d6fe59e4c0348441437ded2aaa
33

44
ARG BUILD_HASH='unknown'
55
ENV BUILD_HASH=$BUILD_HASH
@@ -17,6 +17,7 @@ RUN apk add --update \
1717
tzdata \
1818
libffi-dev \
1919
build-base \
20+
yaml-dev \
2021
&& rm -rf /var/cache/apk/*
2122

2223
RUN mkdir /app

0 commit comments

Comments
 (0)