Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
Srgr0 committed Jan 9, 2024
1 parent e675a8c commit a825464
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/deploytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,5 @@ jobs:
- name: Run install script
run: |
sudo chmod 555 ./a.sh
sed -i 's/git_repository=github_actions/git_repository=https:\/\/github.com\/misskey-dev\/misskey/' ./testenv_githubactions.txt
sed -i 's/git_branch=github_actions/git_branch=master/' ./testenv_githubactions.txt
sudo bash -x ./a.sh -c ./testenv_githubactions.txt
env:
GITHUB_WORKSPACE: $GITHUB_WORKSPACE
5 changes: 2 additions & 3 deletions a.sh
Original file line number Diff line number Diff line change
Expand Up @@ -921,9 +921,8 @@ function install() {
echo "";
tput setaf 3; echo "Process: clone git repository;"; tput setaf 7;

#git_repositoryがlocalならgit cloneしない
if [ $git_repository = "githubactions" ]; then
cp -r $GITHUB_WORKSPACE "$misskey_directory";
if [[ $git_repository == local_* ]]; then
cp -r ${git_repository#local_} "$misskey_directory";
else
sudo -iu "$misskey_user" git clone -b "$git_branch" --depth 1 --recursive "$git_repository" "$misskey_directory";
fi
Expand Down
4 changes: 2 additions & 2 deletions testenv_githubactions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ method=systemd
#Misskey setting
docker_repository=hogehoge
docker_host_ip=hogehoge
git_repository=githubactions
git_branch=githubactions
git_repository=https://github.com/misskey-dev/misskey
git_branch=master
misskey_directory=/home/misskey/misskey
misskey_localhost=localhost
misskey_user=misskey
Expand Down

0 comments on commit a825464

Please sign in to comment.