Skip to content

Commit

Permalink
replace all mentions of SID branch with master branch links
Browse files Browse the repository at this point in the history
  • Loading branch information
Olesja Aarma committed Feb 27, 2025
1 parent 5e4a45f commit d29fb3d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 13 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,11 @@ jobs:
cache: maven

- name: Build with Maven
# temporary dislable tests as SID version of cdoc2-client is not available from GH
run: |
echo "Debug env vars: is_fork=$IS_FORK base_repo=$BASE_REPO MAVEN_REPO=$MAVEN_REPO"
mvn help:active-profiles
echo "Using Maven repo=$(mvn help:evaluate -Dexpression=github_ci.maven_repo -q -DforceStdout)"
mvn -B verify -Dmaven.test.skip=true
mvn -B verify
env:
GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password
IS_FORK: ${{needs.fork_setup.outputs.is_fork}}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ Location: /key-shares/ee368ad654142dda1d9d8e00744df2c8

For more info see [admin-guide.md](admin-guide.md) and other existing configurations:

* [cdoc2-java-ref-impl/test/config/shares-server/docker-compose.yml](https://github.com/open-eid/cdoc2-java-ref-impl/blob/SID/test/config/shares-server/docker-compose.yml) _TODO: update branch SID->master after release_
* [cdoc2-gatling-tests/setup-load-testing](https://github.com/open-eid/cdoc2-gatling-tests/) _TODO: update links_
* [cdoc2-java-ref-impl/test/config/shares-server/docker-compose.yml](https://github.com/open-eid/cdoc2-java-ref-impl/blob/master/test/config/shares-server/docker-compose.yml)
* [cdoc2-gatling-tests/cdoc2-shares-server/setup-load-testing](https://github.com/open-eid/cdoc2-gatling-tests/tree/master/cdoc2-shares-server/setup-load-testing)

For end-to-end tests see
[cdoc2-java-ref-impl/test/bats/README.md](https://github.com/open-eid/cdoc2-java-ref-impl/tree/SID/test#running-smart-idmobile-id-tests-experimental) _TODO: update branch SID->master_
[cdoc2-java-ref-impl/test/bats/README.md](https://github.com/open-eid/cdoc2-java-ref-impl/tree/master/test#running-smart-idmobile-id-tests-experimental)

### GitHub release

Expand Down
4 changes: 2 additions & 2 deletions admin-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ docker run -v /path/to/config/application.properties:/app/config/application.pro
Sample `application.properties` files are in [shares-server/config](shares-server/config)

For full sample setups using `docker compose` and `docker run` see:
* [cdoc2-gatling-tests/setup-load-testing](https://github.com/open-eid/cdoc2-gatling-tests/) for `docker run` examples (TODO: update links)
* [cdoc2-java-ref-impl/test/config/shares-server/docker-compose.yml](https://github.com/open-eid/cdoc2-java-ref-impl/tree/SID/test/config/shares-server) for `docker compose` example ((TODO: update links))
* [cdoc2-gatling-tests/cdoc2-shares-server/setup-load-testing](https://github.com/open-eid/cdoc2-gatling-tests/tree/master/cdoc2-shares-server) for `docker run`
* [cdoc2-java-ref-impl/test/config/shares-server/docker-compose.yml](https://github.com/open-eid/cdoc2-java-ref-impl/tree/v2.0.0/test/config/shares-server) for `docker compose` example


## Database
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# May not be up to date, see
# https://github.com/open-eid/cdoc2-java-ref-impl/tree/SID/test/config/shares-server
# https://github.com/open-eid/cdoc2-java-ref-impl/tree/master/test/config/shares-server
services:
cdoc2-shares-postgres:
Expand Down
9 changes: 4 additions & 5 deletions getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This file describes how to run `cdoc2-shares-server` in your local development m
external infrastructure.

If you just interested how
to run `cdoc2-shares-server` locally, then see [docker-compose.yml](https://github.com/open-eid/cdoc2-java-ref-impl/tree/SID/test/config/shares-server)
to run `cdoc2-shares-server` locally, then see [docker-compose.yml](https://github.com/open-eid/cdoc2-java-ref-impl/tree/master/test/config/shares-server)
in [cdoc2-java-ref-impl](https://github.com/open-eid/cdoc2-java-ref-impl) repo.

### Installing and creating PostgreSQL DB in Docker
Expand Down Expand Up @@ -83,9 +83,8 @@ that are not trivial task to create.

### cdoc2-shares-server additional testing

Check out [cdoc2-java-ref-impl/cdoc2-cli/README.md](https://github.com/open-eid/cdoc2-java-ref-impl/blob/SID/cdoc2-cli/README.md)
for further manual testing (Smart-ID/Mobile-ID) (TODO: replace with new link to `master` branch
after release)
Check out [cdoc2-java-ref-impl/cdoc2-cli/README.md](https://github.com/open-eid/cdoc2-java-ref-impl/blob/master/cdoc2-cli/README.md)
for further manual testing (Smart-ID/Mobile-ID)

Alternatively run `cdoc2-shares-server` functional tests from [cdoc2-gatling-tests](https://github.com/open-eid/cdoc2-gatling-tests)
Alternatively run `cdoc2-shares-server` functional tests from [cdoc2-gatling-tests](https://github.com/open-eid/cdoc2-gatling-tests/tree/master/cdoc2-shares-server)
and/or Smart-ID/Mobile-ID tests from [cdoc2-java-ref-impl/test/bats](https://github.com/open-eid/cdoc2-java-ref-impl/test)

0 comments on commit d29fb3d

Please sign in to comment.