Deployment jobs on CircleCI fail.

Asked 2 years ago, Updated 2 years ago, 420 views

Continued with this question

The composer.json was changed in the EC2 directory, so I changed the local composer.json and git push did not change.
Can I commit by cutting off the branch at EC2?
Thank you for your cooperation.

Ravel Framework 6.18.20

error

#!/bin/bash-eopipefail
ssh-o StrictHostKeyChecking=no-t webapp@${HOST_NAME}"cd laravel & & \
  git pull origin master&&\
  composer install-n --no-dev --prefer-dist&\
  US>npm ci&\
  US>npm run prod&
  phpartisan migrate --force&&\
  phpartisan config:cache"
Warning: Permanently added '**********' (ECDSA) to the list of known hosts.
^@^@remote:Enumerating objects:6, done.        
remote:Counting objects: 100% (6/6), done.        
remote:Compressing objects: 100% (2/2), done.        
remote —Total4(delta2), reused3(delta2), pack-reused0        
Unpacking objects: 100% (4/4), done.                                            
From github.com:Tikka710/Laravel-ci
 * branch master->FETCH_HEAD
   4dbc765..b10d239 master->origin/master
Updating c4b465a..b10d239
error: Your local changes to the following files would be overwritten by merge:
    composer.json
Please commit your changes or stash them before you merge.
Aborting
Connection to ********** closed.

Exited with code exit status 1

laravel circleci

2022-09-30 21:55

1 Answers

Looks like a Git log

 error: Your local changes to the following files would be overwritten by merge:
    composer.json
Please commit your changes or stash them before you merge.

There seems to be some change in the remote composer.json.

git reset HEAD --hard before git pull origin master seems to solve it for now.


2022-09-30 21:55

If you have any answers or tips


© 2024 OneMinuteCode. All rights reserved.