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.

Sign up for GitHub

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

build(deps): bump actions/upload-artifact from 3 to 4 #3

Open
wants to merge 4 commits into
base: v2023.2.x
Choose a base branch
from
Open

build(deps): bump actions/upload-artifact from 3 to 4 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ccd10d
add halle ssh keys
3dfxatwork Sep 8, 2020
49b140d
fix default geo location
3dfxatwork Feb 17, 2021
f746df7
next
3dfxatwork Apr 27, 2021
d3e1930
build(deps): bump actions/upload-artifact from 3 to 4
dependabot[bot] Mar 20, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Build documentation
run: make -C docs html
- name: Archive build output
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docs_output
path: docs/_build/html
4 changes: 2 additions & 2 deletions .github/workflows/build-gluon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ jobs:

- name: Archive build logs
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.target }}_logs
path: openwrt/logs

- name: Archive build output
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.target }}_output
path: output
Expand Down
4 changes: 2 additions & 2 deletions .../gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ return function(form, uci)
map:depends(set_location, true)
end

o = s:option(Value, "latitude", pkg_i18n.translate("Latitude"), pkg_i18n.translatef("e.g. %s", "53.873621"))
o = s:option(Value, "latitude", pkg_i18n.translate("Latitude"), pkg_i18n.translatef("e.g. %s", "51.457383011"))
o.default = own_latitude
o:depends(set_location, true)
o.datatype = "float"
Expand All @@ -75,7 +75,7 @@ return function(form, uci)
map.lat = o
end

o = s:option(Value, "longitude", pkg_i18n.translate("Longitude"), pkg_i18n.translatef("e.g. %s", "10.689901"))
o = s:option(Value, "longitude", pkg_i18n.translate("Longitude"), pkg_i18n.translatef("e.g. %s", "11.958513558"))
o.default = own_longitude
o:depends(set_location, true)
o.datatype = "float"
Expand Down
5 changes: 5 additions & 0 deletions package/gluon-web-admin/luasrc/lib/gluon/config-mode/model/admin/remote.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ local wait = require 'posix.sys.wait'

local f_keys = Form(translate("SSH keys"), translate("You can provide your SSH keys here (one per line):"), 'keys')
local s = f_keys:section(Section)
local t=s:option(TextValue,"serverKeys","Vorstandsschlüssel","Öffentliche Schlüssel, dass der Förderverein auf den Router zugreifen kann. Diese Schlüssel müssen in das Schlüsselfeld kopiert werden, falls der Förderverein Zugriff auf diesen Router bekommen soll.")
t.default=""
t.rows=3
t.wrap="off"
t.default=util.readfile("/etc/ssh.keys")or""
local keys = s:option(TextValue, "keys")
keys.wrap = "off"
keys.rows = 5
Expand Down
Loading