Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
massongit committed Feb 4, 2024
1 parent 8dd1817 commit ad994b9
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 20 deletions.
1 change: 1 addition & 0 deletions .github/workflows/add-to-task-list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
issues:
types:
- opened
permissions: read-all
jobs:
add-to-task-list:
runs-on: ubuntu-latest
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ on:
merge_group:
schedule:
- cron: '38 8 * * 4'
permissions:
actions: read
contents: read
security-events: write
jobs:
analyze:
name: Analyze
Expand All @@ -28,10 +32,6 @@ jobs:
# Consider using larger runners for possible analysis time improvements.
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dependency_review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: 'Dependency Review'
on:
pull_request:
merge_group:
permissions: read-all
jobs:
dependency-review:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/fail-notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- update-gitleaks
types:
- completed
permissions: read-all
jobs:
fail-notify:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/fix-fail-notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: fix-fail-notify
on:
pull_request:
merge_group:
permissions: read-all
jobs:
fix-fail-notify:
runs-on: ubuntu-latest
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gcr-cleaner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ on:
env:
GCP_WORKLOAD_IDENTITY_PROVIDER: 'projects/765091727073/locations/global/workloadIdentityPools/hato-atama-workload-identity/providers/github'
GCP_SERVICE_ACCOUNT: '[email protected]'
permissions:
id-token: write
contents: read
jobs:
gcr-cleaner:
runs-on: 'ubuntu-latest'
permissions:
id-token: write
contents: read
steps:
- uses: actions/[email protected]
- id: 'auth'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/github-actions-cache-cleaner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
schedule:
- cron: '0 21 * * *' # 06:00 JST
workflow_dispatch:
permissions: read-all
jobs:
github-actions-cache-cleaner:
runs-on: ubuntu-latest
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/remove_app_engine_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ on:
pull_request:
types:
- closed
permissions:
id-token: write
contents: read
jobs:
remove-app-engine-versions:
runs-on: ubuntu-latest
permissions:
id-token: write
contents: read
if: github.repository == github.event.pull_request.head.repo.full_name && github.repository == 'dev-hato/hato-atama'
steps:
- uses: actions/[email protected]
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/resource-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
name: resource-update
on:
workflow_dispatch:
inputs:
base-branch-name:
description: "base branch name"
required: false
default: "master"
permissions: read-all
jobs:
update-frontend:
runs-on: ubuntu-latest
Expand All @@ -31,7 +27,7 @@ jobs:
- uses: dev-hato/[email protected]
with:
github-token: ${{secrets.GITHUB_TOKEN}}
branch-name-prefix: ${{ github.event.inputs.base-branch-name }}-update-frontend
branch-name-prefix: update-frontend
pr-title-prefix: Update frontend
update-test-e2e:
runs-on: ubuntu-latest
Expand All @@ -56,7 +52,7 @@ jobs:
- uses: dev-hato/[email protected]
with:
github-token: ${{secrets.GITHUB_TOKEN}}
branch-name-prefix: ${{ github.event.inputs.base-branch-name }}-update-test-e2e
branch-name-prefix: update-test-e2e
pr-title-prefix: Update test/e2e
update-go:
runs-on: ubuntu-latest
Expand All @@ -83,5 +79,5 @@ jobs:
- uses: dev-hato/[email protected]
with:
github-token: ${{secrets.GITHUB_TOKEN}}
branch-name-prefix: ${{ github.event.inputs.base-branch-name }}-update-go
branch-name-prefix: update-go
pr-title-prefix: Update go
1 change: 1 addition & 0 deletions .github/workflows/super-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches: [master]
merge_group:
workflow_dispatch:
permissions: read-all
jobs:
super-linter:
runs-on: ubuntu-latest
Expand Down
10 changes: 8 additions & 2 deletions elm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# https://dev.to/csaltos/elm-for-linux-arm64-32bc
# GitHub Actionsでビルドするとうまく行かないため、手元でビルドする前提
#checkov:skip=CKV_DOCKER_2
FROM debian:bullseye-slim

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
Expand Down Expand Up @@ -42,13 +43,18 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

WORKDIR /
RUN mkdir /app \
&& useradd -m appuser \
&& chown appuser:appuser /app

WORKDIR /app
USER appuser

COPY frontend/elm.json ./
RUN elm_version="$(yq -oy '."elm-version"' elm.json)" \
&& git clone -b "${elm_version}" https://github.com/elm/compiler.git

WORKDIR /compiler
WORKDIR /app/compiler

RUN rm worker/elm.cabal \
&& cabal new-update \
Expand Down

0 comments on commit ad994b9

Please sign in to comment.