Skip to content

Commit

Permalink
Switch version references: 2.03 -> 2.03dev
Browse files Browse the repository at this point in the history
  • Loading branch information
dalepotter committed Jan 25, 2018
1 parent 2280fae commit 70565b5
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion IATI-Codelists
2 changes: 1 addition & 1 deletion IATI-Rulesets
2 changes: 1 addition & 1 deletion IATI-Schemas
Submodule IATI-Schemas updated 289 files
1 change: 1 addition & 0 deletions docs-copy
Submodule docs-copy added at a48f3a
13 changes: 6 additions & 7 deletions gen.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

def get_github_url(repo, path=''):
github_branches = {
'IATI-Schemas': 'version-2.03',
'IATI-Codelists': 'version-2.03',
'IATI-Rulesets': 'version-2.03',
'IATI-Extra-Documentation': 'version-2.03',
'IATI-Codelists-NonEmbedded': 'master',
'IATI-Schemas': 'version-2.03dev',
'IATI-Codelists': 'version-2.03dev',
'IATI-Rulesets': 'version-2.03dev',
'IATI-Extra-Documentation': 'version-2.03dev',
'IATI-Codelists-NonEmbedded': 'version-2.03dev',
}
return 'https://github.com/IATI/{0}/blob/{1}/{2}'.format(repo, github_branches[repo], path)

Expand Down Expand Up @@ -161,7 +161,7 @@ def __init__(self, schema, lang):
self.tree2 = ET.parse("./IATI-Schemas/iati-common.xsd")
self.jinja_env = jinja2.Environment(loader=jinja2.FileSystemLoader('templates'))
self.lang = lang

self.jinja_env.filters['is_complete_codelist'] = is_complete_codelist

def get_schema_element(self, tag_name, name_attribute):
Expand Down Expand Up @@ -496,4 +496,3 @@ def extra_extra_docs():
ruleset_page(lang=language)
codelists_to_docs(lang=language)
extra_extra_docs()

10 changes: 5 additions & 5 deletions update_submodules.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Script to update each of the 4 submodules in the IATI-SSOT repository
#
#

timestamp=$(date +%s)

for version in 1.04 1.05 2.01 2.02 2.03; do
for version in 1.04 1.05 2.01 2.02 2.03dev; do
# Checkout to the specified version for the SSOT directory
git checkout version-$version

Expand All @@ -17,7 +17,7 @@ for version in 1.04 1.05 2.01 2.02 2.03; do
for folder in IATI-Codelists IATI-Extra-Documentation IATI-Schemas IATI-Rulesets; do
# Enter the specified folder (which contains the submodule)
cd $folder

# Ensure that we are on the correct branch (i.e. Git branch)
git checkout version-$version

Expand All @@ -30,10 +30,10 @@ for version in 1.04 1.05 2.01 2.02 2.03; do
# Add the specified folder (which contains the submodule) to staging
git add $folder
done

# Commit updated submodules
git commit -m "Updated submodules (using script) "$version

# Push to the server
git push origin update-submodules-$timestamp-$version
done

0 comments on commit 70565b5

Please sign in to comment.