Skip to content

Commit

Permalink
Merge pull request #577 from cardano-foundation/develop
Browse files Browse the repository at this point in the history
Merge from develop to main
  • Loading branch information
iFergal authored Jul 15, 2024
2 parents 479888d + cc10297 commit 5b3407d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/docker-builds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
permissions:
contents: read
packages: write
runs-on: [arc-runner-set]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -82,14 +82,14 @@ jobs:
echo "EARTHLY_DOCKER_IMAGES_EXTRA_TAGS=${ARTIFACT_VERSION}-${GIT_SHORT_COMMIT} ${ARTIFACT_VERSION}-${GIT_SHORT_COMMIT}-${GITHUB_RUN_ID}" | tee -a "$GITHUB_ENV" | tee -a "$GITHUB_OUTPUT"
- name: Docker Login (private registry)
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.PRIVATE_DOCKER_REGISTRY_URL }}
username: ${{ env.PRIVATE_DOCKER_REGISTRY_USER }}
password: ${{ env.PRIVATE_DOCKER_REGISTRY_PASS }}

- name: Docker Login (hub.docker.com)
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.HUB_DOCKER_COM_USER }}
password: ${{ secrets.HUB_DOCKER_COM_PASS }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-vercel-branch-deploys.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
deploy-branch:
runs-on: [arc-runner-set]
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-vercel-pr-deploys.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
# This workflow contains a single job called "deploy-preview"
deploy-preview:
runs-on: [arc-runner-set]
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
2 changes: 1 addition & 1 deletion src/core/agent/services/connectionService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ class ConnectionService extends AgentService {

@OnlineOnly
async deleteConnectionById(id: string): Promise<void> {
await this.connectionStorage.deleteById(id);
// await this.signifyApi.deleteContactById(id); @TODO - foconnor: Uncomment when KERIA endpoint fixed
await this.connectionStorage.deleteById(id);
const notes = await this.getConnectNotesByConnectionId(id);
for (const note of notes) {
this.connectionNoteStorage.deleteById(note.id);
Expand Down

0 comments on commit 5b3407d

Please sign in to comment.