Skip to content

Commit c6815c4

Browse files
authored
Fix tests (#530)
1 parent 4ad234c commit c6815c4

File tree

8 files changed

+36
-4
lines changed

8 files changed

+36
-4
lines changed

.github/workflows/removeLabel.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Remove Label
2+
on:
3+
pull_request_target:
4+
types: [labeled]
5+
# Ensures that only the latest commit is running for each PR at a time.
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.ref }}
8+
cancel-in-progress: true
9+
jobs:
10+
Remove-Label:
11+
if: contains(github.event.pull_request.labels.*.name, 'safe to test')
12+
name: Remove label
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Remove 'safe to test'
16+
uses: actions-ecosystem/action-remove-labels@v1
17+
with:
18+
labels: "safe to test"

.github/workflows/tests.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,18 @@ jobs:
3333
- name: Install Conan
3434
run: pip install "conan<2" -q
3535

36+
- uses: actions/setup-java@v4
37+
with:
38+
distribution: 'temurin'
39+
java-version: '11'
40+
41+
- name: Install Mono
42+
run: |
43+
sudo apt update
44+
sudo apt install mono-complete
45+
mono --version
46+
if: ${{ matrix.os == 'ubuntu' }}
47+
3648
- name: Install JFrog CLI
3749
run: curl -fL https://install-cli.jfrog.io | sh
3850

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ To install the *[JFrog Extension](https://marketplace.visualstudio.com/items?ite
8888

8989
### Installing the Build Agent
9090

91-
To run the JFrog tasks, the build agents use three tools:
91+
To run the JFrog tasks, the build agents use the following tools:
9292

9393
* JFrog CLI: Runs all the JFrog tasks.
9494
* Maven Extractor (Used by the [JFrog Maven](#jfrog-maven-task) task)

jfrog-tasks-utils/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const fileName = getCliExecutableName();
1010
const jfrogCliToolName = 'jf';
1111
const cliPackage = 'jfrog-cli-' + getArchitecture();
1212
const jfrogFolderPath = encodePath(join(tl.getVariable('Agent.ToolsDirectory') || '', '_jf'));
13-
const defaultJfrogCliVersion = '2.71.3';
13+
const defaultJfrogCliVersion = '2.74.0';
1414
const minCustomCliVersion = '2.10.0';
1515
const minSupportedStdinSecretCliVersion = '2.36.0';
1616
const minSupportedServerIdEnvCliVersion = '2.37.0';

tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dependencies": {
1010
"@jfrog/tasks-utils": "file:../jfrog-tasks-utils/jfrog-tasks-utils-1.0.0.tgz",
1111
"azure-pipelines-task-lib": "4.12.0",
12-
"fs-extra": "^11.1.1",
12+
"fs-extra": "11.2.0",
1313
"js-yaml": "^4.1.0",
1414
"path": "^0.12.7"
1515
},

tests/resources/dotnet/custom.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const TEST_NAME = testUtils.getTestName(__dirname);
55
let inputs = {
66
command: 'custom',
77
customCommand: 'restore',
8-
arguments: '"--build-name=DotNET Test" "--build-number=7"',
8+
arguments: '"--build-name=DotNET Test" "--build-number=7" "--allow-insecure-connections"',
99
rootPath: join(testUtils.getLocalTestDir(TEST_NAME)),
1010
targetResolveRepo: testUtils.getRepoKeys().nugetVirtualRepo,
1111
nugetProtocolVersion: 'v3',

tests/resources/dotnet/restore.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ let inputs = {
1111
packagesDirectory: join(testUtils.getLocalTestDir(TEST_NAME), 'packages'),
1212
verbosityRestore: 'Minimal',
1313
collectBuildInfo: true,
14+
arguments: '"--allow-insecure-connections"',
1415
};
1516

1617
testUtils.copyTestFilesToTestWorkDir(TEST_NAME, 'restore');

tests/resources/nuget/restore.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ let inputs = {
1111
packagesDirectory: join(testUtils.getLocalTestDir(TEST_NAME), 'packages'),
1212
verbosityRestore: 'Detailed',
1313
collectBuildInfo: true,
14+
arguments: '"--allow-insecure-connections"',
1415
};
1516

1617
testUtils.copyTestFilesToTestWorkDir(TEST_NAME, 'restore');

0 commit comments

Comments
 (0)