Home

Nouvelle URL de la documentation : https://docs.tchap.incubateur.net/

release new version

Use github UI to create and publish a new tag/release based on the pattern : vX.Y.Z_1.8.0 where X.Y.Z is the Tchap version and 1.8.0 is the Element version

Upgrade matrix-authentication-service

The procedure below describes a merge of matrix-authentication-service with tag 1.6.0

export TAG_VERSION=v1.7.0

## Add element remote repository if you don’t have it
git remote add upstream https://github.com/element-hq/matrix-authentication-service.git --no-tags

## Fetch specific tag from element repository
git fetch upstream tag $TAG_VERSION

## Create a new branch from main_tchap
git checkout -b upgrade/mas-$TAG_VERSION origin/main_tchap
git push -u origin upgrade/mas-$TAG_VERSION

## Merge the last element-hq/matrix-authentication-service release in tchapgouv/matrix-authentication-service
git merge $TAG_VERSION

# FIX conflict and and stash the changes
# run end to end tests to approve changes

# Stash your changes : this will keep your conflict resolution in separate commits in case there are errors
git stash -u


# Then redo the merge without fixing the conflict and directly commiting them
git merge $TAG_VERSION

git add .
#sometimes you need to git add unmerged files one by one

git merge --continue

# Finally unstash your fix 
git checkout stash -- . # This is preferred over git stash pop or apply which will try to merge the changes and create more conflicts

git add .

git commit -m "fix merge conflict for $TAG_VERSION"

git push origin upgrade/mas-$TAG_VERSION

Create a PR et get it approved.

WARNING Don't squash, don't rebase, **do a merge commit ** we want to preserve the Element git history

Update policies when creating release

• Build the Open Policy Agent policies

  cd policies
  make
  # OR, if you don't have `opa` installed and want to build through the OPA docker image
  make DOCKER=1
  cd ..

• Push the policy.wasm in tchap-infra/ansible/roles/matrix-authentication-service/files