Skip to content
Snippets Groups Projects

[WIP] Update gitlab and gitlab-shell repos in Makefile

AFAIK, currently there is no reference how to update the source files of gitlab and gitlab-shell. I gave this a brief test and it works. If anyone can also test this it would be cool. If we decide to merge it, a section in README will be added as well.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Nice idea @axil . Maybe do git pull --ff-only (or whatever it's called) to avoid unwanted git messes?

    I can see make update failing quickly if your working area is in the middle of something, which I think is good. You changed something, make update fails, you fix it. No magic.

    Am I right about make update failing quickly?

  • Haven't thought of this but it makes sense :) Otherwise, could we do it like the upgrader script: stash any changes, checkout to master and pull?

  • :thumbsdown: for stashing. Sometimes I walk away from my development checkout in the middle of something and then I rely on the state of the working directory to remind me of what I was doing. I don't want that reminder to get stashed, leading me to forget. :)

  • Achilleas Pipinellis Added 2 new commits:

    Added 2 new commits:

    • 2d05314c - Add --ff-only for pull.
    • 1101a3a3091 - Add an update section in README.
  • Achilleas Pipinellis Added 1 new commit:

    Added 1 new commit:

    • 01378040 - Add an update section in README.
  • I updated it to use --ff-only and tested it but I stumbled on another issue. Although the pull is successfully performed, gitlab/.bundle is not invoked. Also running it alone, returns make: 'gitlab/.bundle' is up to date.. I'm not very familiar with makefiles, is there something I'm missing?

  • It's a hack. We use the existence of gitlab/.bundle as a trigger to avoid running bundle install all the time.

    Maybe just add a plain cd gitlab && bundle install in the update: block? It should detect all the proper bundler settings.

  • Achilleas Pipinellis Added 2 new commits:

    Added 2 new commits:

    • 0c935a41 - Call bundle install explicitly on update.
    • 2dbdb5a0 - Postgres needs to be running during update.
  • Ok, now update calls bundle install explicitly. I had a thought to touch Gemfile.lock in order to change its timestamp and tried to add it as a dependency to gitlab/.bundle, but it kept invoking bundle install although the timestamp kept unchanged, so I gave up :/

  • Achilleas Pipinellis Added 1 new commit:

    Added 1 new commit:

    • b8c5b321 - Fix typo leading entering in wrong directory.
Please register or sign in to reply
Loading