Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align staging with master #344

Merged
merged 29 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
777734a
chore: upgrade websocket to version 1.15.1
kjaskiewiczz Nov 28, 2023
bfa4054
Merge pull request #333 from kjaskiewiczz/deps-update
kjaskiewiczz Nov 29, 2023
f991fa0
chore: Move control logic earlier in the filetransfer handler
alfrunes Nov 30, 2023
176380f
chore: Improve idle timeout logic for filetransfer downloads
alfrunes Nov 30, 2023
d11bb25
feat: Add support for HEAD to download API endpoint
alfrunes Nov 30, 2023
ac23e67
Merge pull request #334 from alfrunes/ALV-182
alfrunes Dec 1, 2023
63b1b31
chore: bump golang.org/x/sys from 0.14.0 to 0.15.0
dependabot[bot] Dec 1, 2023
ecbb895
revert: "Merge pull request #334 from alfrunes/ALV-182"
alfrunes Dec 4, 2023
44a508d
revert: "revert: "Merge pull request #334 from alfrunes/ALV-182""
alfrunes Dec 4, 2023
8b81129
Merge pull request #336 from alfrunes/revert-ALV-182
alfrunes Dec 4, 2023
a2ac93e
fix: Respond with error on filetransfer if no bytes are written
alfrunes Dec 6, 2023
7d76fe4
chore: Adjust error message to match test assertions
alfrunes Dec 6, 2023
72f2a09
chore: added dependabot default reviewers
oldgiova Dec 6, 2023
2468144
chore: Do not return `io.EOF` when the empty chunk is received
alfrunes Dec 6, 2023
5ef8fae
chore: Flush buffered writer before returning at end of transmission
alfrunes Dec 6, 2023
178a610
test: Fix unit tests and adjust errors with expectations
alfrunes Dec 6, 2023
6c18f03
Merge pull request #335 from mendersoftware/dependabot/go_modules/gol…
kjaskiewiczz Dec 7, 2023
13eb6c6
Merge pull request #337 from mendersoftware/feature-ALV-182
alfrunes Dec 11, 2023
787998d
Merge pull request #338 from oldgiova/SEC-963-dependabot-default-revi…
lluiscampos Dec 13, 2023
ab022aa
chore: bump github.com/google/uuid from 1.4.0 to 1.5.0
dependabot[bot] Dec 13, 2023
1f33309
chore: bump go.mongodb.org/mongo-driver from 1.13.0 to 1.13.1
dependabot[bot] Dec 13, 2023
250bfa3
chore: downstream pipeline failures workaround
oldgiova Dec 14, 2023
1ecabf0
Merge pull request #340 from mendersoftware/dependabot/go_modules/go.…
kjaskiewiczz Dec 14, 2023
e359543
Merge pull request #339 from mendersoftware/dependabot/go_modules/git…
kjaskiewiczz Dec 15, 2023
26e26ea
Merge pull request #341 from oldgiova/QA-642-downstream-workaround
tranchitella Dec 18, 2023
cf93dc0
chore: update dependencies
kjaskiewiczz Dec 18, 2023
f62f444
Merge pull request #342 from kjaskiewiczz/deps-update
kjaskiewiczz Dec 19, 2023
294dccc
chore: bump golang.org/x/crypto from 0.14.0 to 0.17.0
dependabot[bot] Dec 19, 2023
900466d
Merge pull request #343 from mendersoftware/dependabot/go_modules/gol…
kjaskiewiczz Dec 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ updates:
schedule:
interval: monthly
day: saturday
reviewers:
- "mendersoftware/backend-dependabot-reviewers"
- commit-message:
prefix: chore
directory: /
package-ecosystem: docker
schedule:
interval: monthly
day: saturday
reviewers:
- "mendersoftware/backend-dependabot-reviewers"
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ publish:acceptance:
#
.trigger:alvaldi-helm-version-bump:
stage: alvaldi-version-bump
allow_failure: true
trigger:
project: Northern.tech/NorthernTechHQ/alvaldi-helm
strategy: depend
variables:
SYNC_CONTAINER_NAME: $CONTAINER_NAME
SYNC_IMAGE_TAG: $DOCKER_PUBLISH_COMMIT_TAG
Expand All @@ -136,7 +136,7 @@ trigger:alvaldi-helm-version-bump:staging:
extends:
- .trigger:alvaldi-helm-version-bump
rules:
- if: $CI_COMMIT_BRANCH =~ /^(master|staging)$/
- if: $CI_COMMIT_BRANCH =~ /^(staging)$/
variables:
SYNC_ENVIRONMENT: staging
HELM_PATCH_VERSION: ${CI_PIPELINE_ID}-staging # pre-release version for trigger staging only deploy
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.20.4-alpine3.16 as builder
FROM --platform=$BUILDPLATFORM golang:1.21.5-alpine3.19 as builder
ARG TARGETARCH
WORKDIR /go/src/github.com/mendersoftware/deviceconnect
RUN mkdir -p /etc_extra
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.acceptance
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.4-alpine3.16 as builder
FROM golang:1.21.5-alpine3.19 as builder
WORKDIR /go/src/github.com/mendersoftware/deviceconnect
RUN mkdir -p /etc_extra
RUN echo "nobody:x:65534:" > /etc_extra/group
Expand Down
Loading