Skip to content

Commit

Permalink
git subrepo clone (merge) --force git@github.com:mom-ocean/FMS.git sr…
Browse files Browse the repository at this point in the history
…c/shared

subrepo:
  subdir:   "src/shared"
  merged:   "98a5532b"
upstream:
  origin:   "git@github.com:mom-ocean/FMS.git"
  branch:   "master"
  commit:   "98a5532b"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "57de7d6"
  • Loading branch information
aidanheerdegen committed Sep 17, 2024
1 parent 59e0aad commit 6bdbdd4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/shared/.github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-18.04, ubuntu-20.04 ]
os: [ ubuntu-20.04 ]
# gcc_v: [8, 9] # Version of GFortran we want to use.
build: [ Release, Debug ]
runs-on: ${{ matrix.os }}
Expand Down
6 changes: 3 additions & 3 deletions src/shared/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = git@github.com:mom-ocean/FMS.git
branch = master
commit = 3bd24800ed3cd8b0eb26643afdecf88e10641beb
parent = 80ece3dfb05c11db1a526930d0eff9a395405f13
commit = 98a5532b2e261e408ed0f32e0738fc601bd96594
parent = 59e0aad14896027d4c11a936b936a0325e77dbcf
method = merge
cmdver = 0.4.0
cmdver = 0.4.9

0 comments on commit 6bdbdd4

Please sign in to comment.