Skip to content

Commit

Permalink
merge auto-build PR into main-build
Browse files Browse the repository at this point in the history
  • Loading branch information
auto-build.yml[bot] committed Nov 9, 2024
2 parents bd951e4 + 7ae2a33 commit 1f86e94
Show file tree
Hide file tree
Showing 238 changed files with 2,513 additions and 3,944 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
'node:18-bullseye',
'node:18-bullseye-slim',
'node:20-bullseye-slim',
'node:22-bullseye-slim',
'node:22-bookworm-slim', # Dockerfile で用いられるイメージ。
]

runs-on: ubuntu-22.04
Expand Down
22 changes: 0 additions & 22 deletions .github/workflows/close-stale-auto-build.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/docker-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
docker-push:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
- 'v3*.*.*'

jobs:
git-diff-main-build:
name: git diff remotes/origin/main-build
git-diff-main:
name: git diff remotes/origin/main

runs-on: ubuntu-22.04

Expand All @@ -22,16 +22,16 @@ jobs:

- name: Fail if not all the files are OK
run: |
if [[ -n "$(git diff remotes/origin/main-build)" ]]; then
if [[ -n "$(git diff remotes/origin/main)" ]]; then
echo "ERROR: The project is dirty!"
git diff --stat remotes/origin/main-build
git diff --stat remotes/origin/main
exit 1
else
echo "OK."
fi
release:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -40,10 +40,10 @@ jobs:
- name: Build web-server
run: yarn build
working-directory: ./apps/web-server
- name: mv out directory
run: mv ./apps/web-server/out ./out
- name: mv dist directory
run: mv ./apps/web-server/dist ./dist
- name: Create flocon_web_server.zip
run: zip -r ${GITHUB_WORKSPACE}/flocon_web_server.zip ./out
run: zip -r ${GITHUB_WORKSPACE}/flocon_web_server.zip ./dist

- name: Generate Dockerfile
run: yarn run gen-flyio-dockerfile
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<!-- GitHub Actions のバッジは https://github.com/Atrox/github-actions-badge より作成 -->

[![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fflocon-trpg%2Fservers%2Fbadge%3Fref%3Dmain&style=flat)](https://actions-badge.atrox.dev/flocon-trpg/servers/goto?ref=main)
[![Codecov](https://img.shields.io/codecov/c/github/flocon-trpg/servers?logo=codecov)](https://app.codecov.io/gh/flocon-trpg/servers)
![Snyk Vulnerabilities for GitHub Repo](https://img.shields.io/snyk/vulnerabilities/github/flocon-trpg/servers)
[![GitHub license](https://img.shields.io/github/license/flocon-trpg/servers)](./LICENSE)
[![Discord](https://img.shields.io/discord/919950632662753280?color=5865F2&logo=discord&logoColor=fff&label=discord)](https://discord.gg/cy3vhmU6Tx)

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1f86e94

Please sign in to comment.