Skip to content

Commit

Permalink
Merge branch 'master' into update-rust-dependencies-2024-07-18-hyper
Browse files Browse the repository at this point in the history
  • Loading branch information
tkmcmaster committed Jul 31, 2024
2 parents 5842cc6 + 519f780 commit 342fc77
Show file tree
Hide file tree
Showing 35 changed files with 13,542 additions and 14,288 deletions.
2 changes: 1 addition & 1 deletion agent/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fs/ppaas-agent",
"version": "3.2.3",
"version": "3.3.0",
"description": "Agent Service for running pewpew tests",
"main": "dist/src/app.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fs/ppaas-common",
"version": "3.2.3",
"version": "3.3.0",
"description": "Common Code for the PewPewController and PewPewAgent",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion controller/components/Alert/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Div from "../Div";
import { Div } from "../Div";
import styled from "styled-components";

export const Alert = styled(Div)`
Expand Down
4 changes: 2 additions & 2 deletions controller/integration/pewpew.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ describe("PewPew Util Integration", () => {
const unzippedFiles: File[] = await unzipFile(pewpewZipFile);
log("unzipped " + filename, LogLevel.DEBUG, unzippedFiles);
files = {
additionalFiles: unzippedFiles as any as File
additionalFiles: unzippedFiles
};
log("new files " + filename, LogLevel.DEBUG, files);
if (platform() === "win32") {
Expand Down Expand Up @@ -164,7 +164,7 @@ describe("PewPew Util Integration", () => {
it("postPewPew as latest should respond 200 OK", (done: Mocha.Done) => {
const parsedForm: ParsedForm = {
fields: {
latest: "true"
latest: ["true"]
},
files
};
Expand Down
Loading

0 comments on commit 342fc77

Please sign in to comment.