Skip to content

Commit

Permalink
Merge pull request #4 from thin-edge/update-deps
Browse files Browse the repository at this point in the history
chore: update project dependencies
  • Loading branch information
reubenmiller authored Feb 8, 2024
2 parents 2854281 + 5ed689b commit d51e7cb
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: '>=1.17.0'
- run: go install github.com/goreleaser/nfpm/v2/cmd/nfpm@latest
Expand Down
18 changes: 8 additions & 10 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ on:
# Reference: https://dev.to/petrsvihlik/using-environment-protection-rules-to-secure-secrets-when-building-external-forks-with-pullrequesttarget-hci
pull_request_target:
branches: [ main ]
push:
branches: [ main ]
merge_group:
jobs:
approve:
Expand All @@ -19,7 +17,7 @@ jobs:
# For security reasons, all pull requests need to be approved first before granting access to secrets
# So the environment should be set to have a reviewer/s inspect it before approving it
name: ${{ github.event_name == 'pull_request_target' && 'Test Pull Request' || 'Test Auto' }}
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Wait for approval
run: echo "Approved"
Expand All @@ -28,7 +26,7 @@ jobs:
needs: approve
environment:
name: Test Auto
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
COMPOSE_PROJECT_NAME: ci_${{ matrix.job.image }}_${{github.run_id}}_${{github.run_attempt || '1'}}
DEVICE_ID: ci_${{ matrix.job.image }}_${{github.run_id}}_${{github.run_attempt || '1'}}
Expand All @@ -45,12 +43,12 @@ jobs:
# Checkout either the PR or the branch
- name: Checkout PR
if: ${{ github.event_name == 'pull_request_target' }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR. Only after the manual approval process

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
if: ${{ github.event_name != 'pull_request_target' }}

- uses: reubenmiller/setup-go-c8y-cli@main
Expand All @@ -66,13 +64,13 @@ jobs:
echo 'IMAGE="${{ matrix.job.image }}"' >> .env
cat .env
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: '>=1.17.0'
- run: go install github.com/goreleaser/nfpm/v2/cmd/nfpm@latest
name: Install dependencies

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.9'
cache: 'pip'
Expand All @@ -97,10 +95,10 @@ jobs:
run: just test

- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: reports-${{matrix.job.target}}
name: reports-${{matrix.job.image}}
path: output

- name: Stop demo
Expand Down
2 changes: 1 addition & 1 deletion images/debian.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/thin-edge/tedge-demo-main-systemd:20231221.1
FROM ghcr.io/thin-edge/tedge-demo-main-systemd:latest

# install plugins
COPY ./dist/*.deb /tmp/
Expand Down
2 changes: 1 addition & 1 deletion tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
robotframework~=6.0.0
robotframework-c8y @ git+https://github.com/reubenmiller/robotframework-c8y.git@0.26.1
robotframework-c8y @ git+https://github.com/reubenmiller/robotframework-c8y.git@0.31.3

2 comments on commit d51e7cb

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Robot Results

✅ Passed ❌ Failed ⏭️ Skipped Total Pass % ⏱️ Duration
4 0 0 4 100 8.262999999s

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Robot Results

✅ Passed ❌ Failed ⏭️ Skipped Total Pass % ⏱️ Duration
4 0 0 4 100 7.336s

Please sign in to comment.