Skip to content

Commit

Permalink
Merge branch 'master' into localBuild3
Browse files Browse the repository at this point in the history
  • Loading branch information
karianna authored Apr 23, 2024
2 parents 43b5c93 + 0936cc2 commit 45e4efb
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ jobs:
path: workspace/target/*

- name: Restore build artifacts
uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
uses: actions/download-artifact@9c19ed7fe5d278cd354c7dfd5d3b88589c7e2395 # v4.1.6
with:
name: ${{matrix.version}}-${{matrix.os}}-${{matrix.variant}}
path: ~/${{matrix.version}}-${{matrix.os}}-${{matrix.variant}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/license-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Check License Header
uses: apache/skywalking-eyes@6b2529214f6b1ccee3ec92bb0adfeabf6f66f538 # v0.5.0
uses: apache/skywalking-eyes@cd7b195c51fd3d6ad52afceb760719ddc6b3ee91 # v0.6.0
1 change: 1 addition & 0 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ header:
- '.github/linters/*'
- 'cyclonedx-lib/getDependencies'
- 'makejdk-any-platform.1'
- 'serverTimestamp.properties'
13 changes: 0 additions & 13 deletions serverTimestamp.properties
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
# ********************************************************************************
# Copyright (c) 2021 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made
# available under the terms of the Apache Software License 2.0
# which is available at https://www.apache.org/licenses/LICENSE-2.0.
#
# SPDX-License-Identifier: Apache-2.0
# ********************************************************************************

comodaca=http://timestamp.comodoca.com/authenticode
globalsign=http://timestamp.globalsign.com/scripts/timstamp.dll
isectigo=http://timestamp.sectigo.com
Expand Down

0 comments on commit 45e4efb

Please sign in to comment.