Skip to content

Commit 5fcdc54

Browse files
authored
Merge branch 'main' into fix-timetable
2 parents 69422d3 + 70c9c98 commit 5fcdc54

File tree

10 files changed

+90
-21
lines changed

10 files changed

+90
-21
lines changed

.github/workflows/build-branch.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ jobs:
1010
uses: cloudnativedaysjp/reusable-workflows/.github/workflows/wc-build-image.yml@main
1111
permissions:
1212
contents: read
13+
id-token: write
1314
with:
1415
image_name: dreamkast-ecs
1516
platforms: amd64
1617
aws_region: us-west-2
1718
run-trivy: true
18-
secrets:
19-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
20-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/build-tag.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ on:
66

77
jobs:
88
build:
9-
uses: cloudnativedaysjp/reusable-workflows/.github/workflows/build-image.yml@main
9+
uses: cloudnativedaysjp/reusable-workflows/.github/workflows/wc-build-image.yml@main
1010
permissions:
1111
contents: read
12+
id-token: write
1213
with:
1314
image_name: dreamkast-ecs
1415
platforms: amd64
1516
aws_region: ap-northeast-1
1617
run-trivy: false
17-
secrets:
18-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
19-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/gitops-prd.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ on:
88
jobs:
99
gitops-ecs:
1010
uses: cloudnativedaysjp/reusable-workflows/.github/workflows/wc-update-ecs-manifest.yml@main
11-
permissions: {}
11+
permissions:
12+
id-token: write
1213
with:
1314
target-image: dreamkast_ecs
1415
environment: prod

.github/workflows/gitops-stg.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ on:
88
jobs:
99
gitops-ecs:
1010
uses: cloudnativedaysjp/reusable-workflows/.github/workflows/wc-update-ecs-manifest.yml@main
11-
permissions: {}
11+
permissions:
12+
id-token: write
1213
with:
1314
target-image: dreamkast_ecs
1415
environment: stg

.github/workflows/make-swagger-artifacts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
runs-on: ubuntu-latest
2020
permissions:
2121
contents: read
22+
id-token: write
2223
timeout-minutes: 30
2324

2425
steps:
2526
- name: Configure AWS Credentials
2627
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
2728
with:
28-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
29-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
3029
aws-region: ap-northeast-1
30+
role-to-assume: arn:aws:iam::607167088920:role/github-actions-dreamkast
3131

3232
- name: Login to Amazon ECR
3333
id: login-ecr

.github/workflows/reviewapp-cleanup.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ on:
77
jobs:
88
cleanup:
99
uses: cloudnativedaysjp/reusable-workflows/.github/workflows/wc-cleanup-ecs-reviewapps.yml@main
10-
permissions: {}
10+
permissions:
11+
id-token: write
1112
with:
1213
prefix: dk-
1314
secrets:
1415
APP_ID: ${{ secrets.APP_ID }}
1516
APP_PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
16-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
17-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/reviewapp.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ jobs:
1515
permissions:
1616
contents: read
1717
pull-requests: read
18+
id-token: write
1819
secrets:
1920
APP_ID: ${{ secrets.APP_ID }}
2021
APP_PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
21-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
22-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2322

2423
update-comment:
2524
needs: [reviewapp]

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,3 +220,5 @@ git config pre-commit.ruby "bundle exec ruby"
220220
git config pre-commit.checks "[rubocop]"
221221
```
222222

223+
224+

app/views/event/cnds2025_show.html.erb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
</div>
9393
</div>
9494
<div class="grid"
95-
style="--rows: <%= ((conference_day.end_time - conference_day.start_time).to_i / 60) - 150 + 0 %>">
95+
style="--rows: <%= ((conference_day.end_time - conference_day.start_time).to_i / 60) - 150 + 10 %>">
9696
<% @conference.tracks.map(&:name).each_with_index do |track_name, n| %>
9797
<div class="track <%= 'even' if n.zero? || n.even? %>"
9898
style="--track: <%= n %>"><%= "Track #{track_name}" %></div>
@@ -111,7 +111,7 @@
111111

112112
total_break = lunch_break + each_break
113113

114-
row_start = ((talk.start_time.in_time_zone('Asia/Tokyo') - Time.zone.parse("2000-01-01 10:00")) / 60).to_i - total_break
114+
row_start = ((talk.start_time.in_time_zone('Asia/Tokyo') - Time.zone.parse("2000-01-01 10:20")) / 60).to_i - total_break
115115
row_end = ((talk.end_time - talk.start_time).to_i / 60) + row_start
116116
%>
117117
<div class="talk"
@@ -189,12 +189,10 @@
189189
<p class="text-black-75 mb-4 text-center"><%= line.html_safe %></p>
190190
<% end %>
191191
</div>
192-
<!--
193192
<div class="col-lg-12 text-center mt-4 projects" id="project-list">
194193
<h2 class="text-black mt-0">企画一覧</h2>
195-
<%= render(partial: "contents/cndw2024/projects") %>
194+
<%= render(partial: "contents/cnds2025/projects") %>
196195
</div>
197-
-->
198196
</div>
199197
</div>
200198
</section>
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
require 'slack/incoming/webhooks'
2+
3+
namespace :util do
4+
desc 'add_talks_for_cnds2025_intermission'
5+
task add_talks_for_cnds2025_intermission: :environment do
6+
ActiveRecord::Base.logger = Logger.new($stdout)
7+
Rails.logger.level = Logger::DEBUG
8+
9+
def add_talk(param)
10+
talk = Talk.new(param)
11+
talk.save!
12+
if talk.abstract != 'intermission'
13+
proposal = Proposal.new(conference_id: conference.id, talk_id: talk.id, status: 1)
14+
proposal.save!
15+
end
16+
video = Video.new(talk_id: talk.id, on_air: false)
17+
video.save!
18+
end
19+
20+
conference = Conference.find_by(abbr: 'cnds2025')
21+
tracks = Hash[conference.tracks.map { |track| [track.name, track.id] }]
22+
23+
track_a_talks = [
24+
%w[08:00:00 10:20:00 開始までしばらくお待ちください intermission],
25+
%w[10:20:00 10:30:00 オープニング intermission],
26+
%w[12:20:00 13:20:00 休憩 intermission],
27+
%w[14:00:00 14:20:00 休憩 intermission],
28+
%w[15:00:00 15:20:00 休憩 intermission],
29+
%w[16:00:00 16:20:00 休憩 intermission],
30+
%w[17:00:00 17:20:00 休憩 intermission],
31+
%w[18:00:00 18:10:00 休憩 intermission],
32+
%w[18:10:00 19:00:00 クロージング intermission],
33+
%w[19:00:00 20:00:00 本日のイベントは終了しました intermission]
34+
]
35+
36+
other_track_talks = [
37+
%w[08:00:00 10:20:00 開始までしばらくお待ちください intermission],
38+
%w[10:20:00 10:30:00 トラックAでオープニング実施中! intermission],
39+
%w[10:30:00 12:20:00 トラックAでキーノート配信中! intermission],
40+
%w[12:20:00 13:20:00 休憩 intermission],
41+
%w[14:00:00 14:20:00 休憩 intermission],
42+
%w[15:00:00 15:20:00 休憩 intermission],
43+
%w[16:00:00 16:20:00 休憩 intermission],
44+
%w[17:00:00 17:20:00 休憩 intermission],
45+
%w[18:00:00 18:10:00 休憩 intermission],
46+
%w[18:10:00 19:00:00 トラックAでクロージング実施中! intermission],
47+
%w[19:00:00 20:00:00 本日のイベントは終了しました intermission]
48+
]
49+
50+
days = conference.conference_days.where(internal: false)
51+
52+
days.each do |day|
53+
track_a_talks.each do |arr|
54+
param = { start_time: arr[0], end_time: arr[1], title: arr[2], abstract: arr[3] }
55+
add_talk(param.merge(conference_id: conference.id, conference_day_id: day.id, track_id: tracks['A'], show_on_timetable: false))
56+
end
57+
58+
tracks.except('A').each do |_track_name, track_id|
59+
other_track_talks.each do |arr|
60+
param = { start_time: arr[0], end_time: arr[1], title: arr[2], abstract: arr[3] }
61+
add_talk(param.merge(conference_id: conference.id, conference_day_id: day.id, track_id:, show_on_timetable: false))
62+
end
63+
end
64+
65+
# https://cloudnativedays.slack.com/archives/C087QPW51RQ/p1745897807167199?thread_ts=1745857454.682939&cid=C087QPW51RQ
66+
# 各トラックにComing Soonのセッションを追加
67+
tracks.each do |_track_name, track_id|
68+
param = { start_time: '16:20:00', end_time: '17:00:00', title: 'Coming Soon', abstract: '魅力的なセッションを企画中!' }
69+
add_talk(param.merge(conference_id: conference.id, conference_day_id: day.id, track_id:, show_on_timetable: true))
70+
end
71+
end
72+
end
73+
end

0 commit comments

Comments
 (0)