Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat 2024.9.0 本番 #14683

Closed
wants to merge 71 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
4e9a7e8
Merge pull request #1 from misskey-dev/master
usuyuki Jul 17, 2022
6a5fb26
wip バージョンを独自のものに変更
usuyuki Jul 17, 2022
06ad3da
fix url修正
usuyuki Jul 17, 2022
b2a7f9d
Merge pull request #2 from misskey-dev/master
usuyuki Jul 30, 2022
98869ab
Merge branch 'usuyukey-master' into master
usuyuki Jul 30, 2022
22eb96a
Merge pull request #3 from Usuyuki/master
usuyuki Jul 30, 2022
2765469
Merge remote-tracking branch 'upstream/master'
usuyuki Aug 12, 2022
e9bb618
Merge pull request #5 from Usuyuki/master
usuyuki Aug 12, 2022
697594a
fix version
usuyuki Aug 12, 2022
fd78bfb
fix え、package.json、本家のmasterとちがうくない?
usuyuki Aug 27, 2022
d6ed089
Merge pull request #6 from Usuyuki/fix/もしかしてコンフリクト解消でやったかも?
usuyuki Aug 27, 2022
0c20dc6
Merge branch 'misskey-dev:develop' into usuyukey-master
usuyuki Aug 28, 2022
ac96046
アップデート用のシェルスクリプト追加
usuyuki Sep 10, 2022
59b7663
Merge remote-tracking branch 'upstream/master' into usuyukey-master
usuyuki Sep 10, 2022
3934a7b
feat versionアップ
usuyuki Sep 10, 2022
1fb3198
Merge remote-tracking branch 'upstream/master' into usuyukey-master
usuyuki Dec 3, 2022
479e3bb
Merge pull request #8 from usuyuki/wip/12.119.1追従
usuyuki Dec 3, 2022
58f83d2
Merge remote-tracking branch 'upstream/master' into wip/12.119.2対応
usuyuki Dec 4, 2022
62701bc
Merge pull request #9 from usuyuki/wip/12.119.2対応
usuyuki Dec 4, 2022
63c9b7b
Merge remote-tracking branch 'upstream/master' into usuyukey-master@v13
usuyuki Jan 16, 2023
4faf0f5
Merge remote-tracking branch 'upstream/master' into usuyukey-master@v13
usuyuki Jan 22, 2023
1e84ec9
Merge remote-tracking branch 'upstream/master' into usuyukey-master@v13
usuyuki Jan 25, 2023
7265ada
Merge remote-tracking branch 'upstream/master' into usuyukey-master@v13
usuyuki Feb 2, 2023
5ed9a4f
Merge remote-tracking branch 'upstream/master' into usuyukey-master@v13
usuyuki Feb 4, 2023
0bb7d5e
Merge remote-tracking branch 'upstream/master' into usuyukey-master@v13
usuyuki Feb 13, 2023
b81dd75
Merge remote-tracking branch 'upstream/master' into usuyukey-master@v13
usuyuki Feb 25, 2023
a841a0f
fix バージョン明記をymlでするように変更
usuyuki Mar 2, 2023
b418a4a
feat 自動デプロイおためし
usuyuki Mar 2, 2023
48d14b5
Merge pull request #19 from usuyuki/feat/自動化
usuyuki Mar 2, 2023
f8d7e56
fix 初歩的なミス
usuyuki Mar 2, 2023
bdfe769
Merge pull request #20 from usuyuki/feat/自動化
usuyuki Mar 2, 2023
425e861
fix sudo sオプション
usuyuki Mar 2, 2023
dfc772d
Merge pull request #21 from usuyuki/feat/自動化
usuyuki Mar 2, 2023
64c8396
fix ?
usuyuki Mar 2, 2023
5310b22
Merge pull request #22 from usuyuki/feat/自動化
usuyuki Mar 2, 2023
9dd481f
wip debug
usuyuki Mar 2, 2023
53fe634
Merge pull request #23 from usuyuki/feat/自動化
usuyuki Mar 2, 2023
abb5615
feat
usuyuki Mar 2, 2023
ab6b2c6
Merge pull request #24 from usuyuki/feat/自動化
usuyuki Mar 2, 2023
7636811
wip
usuyuki Mar 2, 2023
178bb37
Merge pull request #25 from usuyuki/feat/自動化
usuyuki Mar 2, 2023
aac48ef
wip
usuyuki Mar 2, 2023
0284b26
Merge pull request #26 from usuyuki/feat/自動化
usuyuki Mar 2, 2023
6e67724
shで実行することで他のターミナルに移動せず他のユーザーでcdして実行
usuyuki Mar 2, 2023
eee477a
Merge pull request #27 from usuyuki/feat/自動化
usuyuki Mar 2, 2023
d36b7a5
fix フルパスしてい
usuyuki Mar 2, 2023
7e0c5f9
Merge pull request #28 from usuyuki/feat/自動化
usuyuki Mar 2, 2023
73eb619
Merge branch 'master' of https://github.com/misskey-dev/misskey into …
usuyuki Mar 2, 2023
fd7bb4f
Merge pull request #30 from usuyuki/misskey-dev-master
usuyuki Mar 2, 2023
0a17705
Merge pull request #31 from misskey-dev/master
usuyuki Mar 5, 2023
180a7e1
Merge remote-tracking branch 'upstream/master' into misskey-dev-master
usuyuki Mar 5, 2023
5268c5f
Merge branch 'usuyukey-master@v13' into misskey-dev-master
usuyuki Mar 5, 2023
d7f762d
Merge pull request #33 from misskey-dev/master
usuyuki Mar 11, 2023
2a128a9
Merge pull request #34 from misskey-dev/master
usuyuki Mar 24, 2023
4e9a24e
Merge pull request #36 from misskey-dev/master
usuyuki Apr 9, 2023
ba8a3d0
Merge pull request #38 from misskey-dev/master
usuyuki May 10, 2023
2ea898c
Merge pull request #40 from misskey-dev/master
usuyuki Jun 6, 2023
2104a8a
Merge pull request #43 from misskey-dev/master
usuyuki Jun 6, 2023
54693aa
Merge pull request #45 from misskey-dev/master
usuyuki Jul 26, 2023
f0b558a
Merge pull request #47 from misskey-dev/master
usuyuki Sep 25, 2023
161142f
Merge pull request #49 from misskey-dev/master
usuyuki Oct 10, 2023
f01b06d
Merge pull request #51 from misskey-dev/master
usuyuki Nov 6, 2023
8034092
Merge pull request #53 from misskey-dev/master
usuyuki Dec 24, 2023
c9808e7
Merge pull request #55 from misskey-dev/master
usuyuki Feb 22, 2024
98bdf4e
Merge pull request #57 from misskey-dev/master
usuyuki May 7, 2024
c4fcfa4
Merge pull request #59 from misskey-dev/master
usuyuki Jun 12, 2024
e98f66d
Merge pull request #14233 from misskey-dev/develop
misskey-release-bot[bot] Jul 31, 2024
882c8b9
Merge pull request #14391 from misskey-dev/develop
misskey-release-bot[bot] Aug 18, 2024
5fc8b3b
Merge pull request #14580 from misskey-dev/develop
misskey-release-bot[bot] Sep 29, 2024
0bf8d38
Merge pull request #61 from misskey-dev/master
usuyuki Oct 3, 2024
4ecbde1
Merge branch 'develop' into misskey-dev-master
usuyuki Oct 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions .github/workflows/deployRasPi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: うすゆきー自動デプロイ

on:
pull_request:
branches:
- usuyukey-master@v13
types: [closed]

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Deploy
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.SERVER_HOST }}
username: ${{ secrets.SERVER_USERNAME }}
key: ${{ secrets.SERVER_SSH_KEY }}
port: ${{ secrets.SERVER_PORT }}
script: |
echo "START🚀"
echo "${{ secrets.SERVER_USER_PASSWORD }}" | sudo -S systemctl stop misskey
sudo -u misskey sh -c 'cd /home/misskey/usuyukey && git fetch'
sudo -u misskey sh -c 'cd /home/misskey/usuyukey && git reset --hard origin/usuyukey-master@v13'
sudo -u misskey sh -c 'cd /home/misskey/usuyukey && git submodule update --init --recursive'
sudo -u misskey sh -c 'cd /home/misskey/usuyukey && sed -i -e "s/\(\"version\": \".*\)\(\"\)/\\1-usuyukey-${{ secrets.USUYUKEY_VERSION }}\2/" package.json'
sudo -u misskey sh -c 'cd /home/misskey/usuyukey && /home/misskey/.asdf/shims/pnpm install'
sudo -u misskey sh -c 'cd /home/misskey/usuyukey && /home/misskey/.asdf/shims/pnpm clean'
sudo -u misskey sh -c 'cd /home/misskey/usuyukey && NODE_ENV=production /home/misskey/.asdf/shims/pnpm build'
sudo -u misskey sh -c 'cd /home/misskey/usuyukey && NODE_ENV=production /home/misskey/.asdf/shims/pnpm migrate'
sudo systemctl restart misskey
echo "DONE🥳"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"codename": "nasubi",
"repository": {
"type": "git",
"url": "https://github.com/misskey-dev/misskey.git"
"url": "https://github.com/Usuyuki/usuyukey.git"
},
"packageManager": "pnpm@9.6.0",
"workspaces": [
Expand Down
5 changes: 5 additions & 0 deletions update.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
git pull origin usuyukey-master
git submodule update --init
yarn install
yarn build
yarn migrate